Update requirements.txt

fixes #9
Update setup.py

fixes #9
Merge remote-tracking branch 'pypi/master'
PEP8 pedantry