pep8/pyflakes clean up
Merge pull request #2 from tacaswell/pep8

pep8/pyflakes clean up