now PEP8 compliant
Merge branch 'master' of https://github.com/abroby/bittorphile