Support for config merging from specified directory
Merge pull request #658 from XTAIN/config-dir

Support for config merging from specified directory