Re-organization and update of requirements in setup.py
Merge pull request #2 from Runscope/update-setup

Re-organization and update of requirements in setup.py