Fixed pep8 test fails introduced by pep8 v1.50.

This should fix the problems we're currently experiencing with Travis.
Tests out locally.  Let's see if it flies...