Merge pull request #226 from sethmcl/master

Allow config properties to inherit instead of overriding