PEP8 fixes: mixed tabs / spaces, blank lines.
Merge pull request #156 from erny/master

PEP8 fixes: mixed tabs / spaces, blank lines.