PEP8
Merge branch 'version-1_1' of github.com:AIFDR/inasafe into version-1_1