Zundel/pip change

With these changes I was able to more reliably build pants.  See the corresponding message on pants-dev