Bunch of changes to setup.py. Version bump.