Fix pep8 errors

A new version of pep8 has been released which is stricter about
enforcing certain rules.  This makes minor changes across the source
tree to correct these complaints.
Merge pull request #46 from klmitch/pep8-fix

Fix pep8 errors