pep8 cleanup
removed unused import
Merge branch 'master' into PEP8_cleanup
merging in latest master
fixed merge issue
Merge pull request #68 from onefinestay/PEP8_cleanup

Pep8 cleanup