Add setup.py for distools
Fixed setup.py
Merge branch 'master' into development

Grab the setuptools stuff from master.