Fix setup.py for upload to PyPi