Fix PEP8 coding style violations (all but E501)

Mostly only whitespace changes.
`pep8 *.py --ignore=E501` returns nothing anymore.

As part of http://24pullrequests.com
Reverding indentation
Merge pull request #103 from habi/master

Fix PEP8 coding style violations (all but E501)