first pep8 work
more pep8 fixes
pep8 finished
Merge pull request #333 from greedo/pep8

PEP8