Fixed some stuff in setup.py pre upload to pypi