Renaming some code and making it easier to configure overall
Merge branch 'master' of https://github.com/NERC-CEH/dynamo-mapping