First cleanup branch commit

This fixes some import and whitespace issues to align closer to pep8.
I added a few comments to make further contributions easier.
Removed uselss comment.
Merge pull request #730 from chrisglass/pep8ing-phase-one

First cleanup branch