Update to Setuptools 2.1 and Pip 1.5.2

So seamless.
Merge remote-tracking branch 'origin/master'