PEP8 Cleanup
PEP8 cleanup
PEP8 Cleanup
PEP8 Cleanup
PEP8
PEP8
PEP8
PEP8
PEP8
Whitespace changes

Some are PEP8, some are just making the violations consistent
Merge pull request #341 from dsnellgrove/pep8-1

Whitespace "fixes"