Pep8 1.5.0 (rebased onto develop)



This is the same as gh-2208 but rebased onto develop.

----

Travis just bumped its PEP8 version to 1.5.0 which means job will fail until the flake8-tested folders get minor fixes.

To test this PR, check the Travis build passes,