undo the changes on setup.py; need to find a workaround for this
Merge branch 'master' of https://github.com/hallaj/inupypi