updates to setup.py
Merge pull request #10 from jeremyschulman/master

updates to setup.py