Upgrade pkg_resources to setuptools 2.1
Merge pull request #1490 from dstufft/upgrade-pkg_resources

Upgrade pkg_resources to setuptools 2.1