Updated setup.py
Cleanup
Update version, cleanup