various pep8 cleanup, typo fixes, etc
Merge pull request #1293 from mhrivnak/cleanup

various pep8 cleanup, typo fixes, etc