Pyflakes, pep8 fixes.
Merge pull request #7 from mdickinson/pep8-clean

Pyflakes, pep8 fixes.