Address all pep8 whitespace issues.
Merge branch 'exception-fix' into pep8
Fix all pep8 warnings/errors that are whitespace-only changes.
Fix all pep8 warnings/errors that are non-whitespace changes.
Merge pull request #53 from bje-/pep8

PEP8 fixes