Allow partial configuration by merging with default configuration
Merge pull request #6 from jmmcduffie/merge-default-and-local-config

Allow partial configuration by merging local with default configuration