PEP8: Fix recently introuced pep8 violations
Merge pull request #3052 from timleslie/master

PEP-8 conformance improvements