Fix-up setup.py

- Closes #30
Merge pull request #31 from requests/fix-setup-py

Fix-up setup.py