PEP-8/style fixes.
Merge pull request #105 from coddingtonbear/fix_pep8_errors

PEP-8/style fixes.