Modified setup.py again to get PyPI to work. Everything seems to be good now.