Update setup.py info, reflecting new changes, cleaning up, etc
Correct version expectation