Merge branch 'master' into packaging
Move to merged setuptools; remove distribute_setup
Merge branch 'packaging'