More pep8 fixes
Merge pull request #12 from davismr/master

More pep8 fixes