pep8 and some configs that made broke tests
Merge branch 'master' into staging