Merge branch 'master' of https://github.com/jembi/openhim-core-js
Merge branch 'master' of https://github.com/jembi/openhim-core-js
Merge branch 'master' of https://github.com/jembi/openhim-core-js
Refactored config contruction strategy to allow for custom config file
updated config to fix failing test - test variables were not being included
Changed commandline varaible (path) to conf
Merge pull request #288 from jembi/config-loading-refactor

Config loading refactor - closes #177
Update README.md

Updated the README to explain how to add a custom configuration script that overrides any default.json configurations
Update README.md

Removed the word 'property'
Convert tabs to spaces