whitespace, and general PEP8 scrubbing
Merge pull request #50 from scoates/pep8

whitespace, and general PEP8 scrubbing