pep8 fixes for pep8 1.4.5

Newer versions of pep8 are better at checking indentation levels.
This patch should fix issues in melange being compatible with pep8
1.4.5
Merge pull request #38 from blamarvt/pep8-1.4.5

pep8 fixes for pep8 1.4.5