replaces extend with merge when overriding config properties
Merge pull request #2 from ajwhite/bugfix/overridable-props

Bugfix - Merging overridable properties