Updated setup.py, preparing for PyPi