Fix Python files to comply with PEP8 1.5.0 (rebased onto develop)



This is the same as gh-85 but rebased onto develop.

----