Revert "Fixed indentation in order to remove pep8 errors"

This reverts commit b37c7e28f8b47e7556d2d3fef8da41110d2e6547. Error was
apparently due to a bug in pep8 <= 1.5.6
Enforce pep8 version >= 1.5.7 since 1.5.6 is buggy