Handle cases where keywords are not creatable more gracefully. Also update default location for keywords cache sqlite db to ~/.inasafe/ to prevent permission errors and provide per-userkeyword caches
Added missing keywords.db to keyword cache path
Use consistent name reference to button
Remove yellow dot and prevent error.
Merge branch 'master' of github.com:AIFDR/inasafe
Fixes for batch runner test
port zonal stats and postprocessor
Merge branch 'master' into inasafe_qgis2

Conflicts:
	safe_qgis/batch/batch_dialog.py
	safe_qgis/ui/resources_rc.py
	safe_qgis/utilities/utilities.py
minor fixes in batch dialog
Fix #621
fix tests for tools
All batch tests should pass now
Restore state at end of batch ctor
add missed import
Cody tidy ups - no yellow dots
Cody tidy ups - no yellow dots
Cody tidy ups - no yellow dots
Cody tidy ups - no white dots
Fixed issues preventing the batch runner from working properly on some hosts. Use exec_ for all tools instead of modal when they are launched from plugin.py
Merge branch 'master' into inasafe_qgis2

Conflicts:
	safe_qgis/batch/batch_dialog.py
	safe_qgis/ui/resources_rc.py
	safe_qgis/utilities/utilities.py