Update setup.py to reflect recent changes.
Merge pull request #80 from balshetzer/master

Update setup.py to reflect recent changes.