pep8 + imports cleanup
Merge pull request #1 from tshirtman/master

pep8 + imports cleanup