Fixed imports, line lengths and removed commented code
Pep changes
Moar fixes
Merge pull request #27 from praekelt/feature/issue-27-pep8

Please adhere to pep8.