A couple of issues relating to virtualenv arose while testing on Ubuntu 15.10. Adjust the virtualenv setting in the pip install phase to work correctly and simplify the check and install of virtualenv so we get the right package. Change-Id: I09fb604ec6667aa45c3c2063adf3d760114aa65a