Fix errors criticized by pep8.
Merge pull request #16 from johnjohndoe/fix-python-style-guide-errors

Fix errors criticized by pep8.