Add support for ordered dicts in keywords.
Merge branch 'develop' of github.com:AIFDR/inasafe into develop
Merge pull request #1329 from cchristelis/develop

Add ordered dict support for keywords.