[Safe Refactor] Update scripts and Makefile.
Merge branch 'safe_refactor' of github.com:akbargumbira/inasafe into safe_refactor