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

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