Merge pull request #970 from dstufft/upgrade

Upgrade setuptools