Merge pull request #974 from dstufft/upgrade

Upgrade setuptools and pip