Explicitly test for setuptools and not pkg_resources
Merge pull request #1453 from dstufft/test-for-setuptools-not-pkg-resources

Explicitly test for setuptools and not pkg_resources