Merge branch 'develop'
Bumped version to 2.0.3
Fix pylint errors
Pep8 fixes - all pep8 passes
Merge remote-tracking branch 'origin'
Merge branch 'master' of github.com:AIFDR/inasafe