pep8 stuff
Merge branch 'master' of github.com:jtushman/bouncer