move requirements to inside the setup.py
Merge pull request #1 from graingert/master

Move requirements to setup.py to allow txsocksx to be added to PyPi