make it work on new setuptools
Merge remote-tracking branch 'jacktoole1/master'