Revert "more aggressive flake8-based cleanup"

This reverts commit 84c41ed229a2758a7a008968cc3312153113cc89.

Moving flake8 testing stuff to a branch for now.

It is strangely not passing (with minimal error
info) on Travis--though all local tests pass just
fine.

Classic.