Upgrade to pip 6.1.0 and the corresponding virtual env. (We can't upgrade beyond this yet due to python version mismatch.)
