fixed merging of sub-hash to recurse instead of just merging top level
Merge branch 'master' of github.com:lucastheisen/config-entities