Fix a ton of pep8/flake8 warnings and errors
Missed a few pep8 warnings
Merge pull request #14 from cypher/pep8-fixes

Fix a ton of pep8/flake8 warnings and errors