Fixed failing PEP8 tests.
Merge pull request #302 from pelson/pep8_testing2

Fixed failing PEP8 tests.