more pkg_resources stuff
Merge branch 'master' into extern-darwin