Preparation for test-friendly configuration loading in java server code.
Merge branch 'dev' of https://github.com/msneddon/narrative_method_store into dev