Spaces to tabs, pep8
Remove unused, use `is` for bool comparisons
Merge pull request #1 from alexlouden/master

Pep8 and minor fixes