Cleanup and setup.py changes in preparation for PyPi deploy.