Fix scripts to comply with PEP8 1.5.0
Fix commented blocks indentation
Merge pull request #73 from sbesson/rebased/develop/pep8_1.5.0

Fix scripts to comply with PEP8 1.5.0 (rebased onto develop)