Travis/pep8

I didn't fully port the pep8 script from master when I got Travis working again. This does that. It also corrects the pep8 failures exposed by  ``make pep8``, which runs a simpler set of pep8 checks, those that we can implement without any ambiguity.