PEP8'd most low hanging fruit.
Merge branch 'master' of https://github.com/jta/scrape.fm