Revert "Looks like travis has a slightly different version of flake8 :-("

This reverts commit c754878b49f5653211fea6e77dd98af6b5271d6d.
Travis tweaks