Updated setup.py to be more compatible with pypi.j