pep8 and pyflakesed. FIXME: pylint me
Merge branch 'codelint'