Stop doing special things with setuptools

pip 1.4 can handle the distribute/setuptools upgrade sequencing
appropriate. So it turns out all we need to upgrade is pip, and then the
rest will fall in to place. This will still not fix the packages vs. pip
interactions, but we don't to muck with the system setuptools packages
at all.

Change-Id: I99220ccc190798c3eb77bb2361abc6606bd546b4
Merge "Stop doing special things with setuptools"