Fixes issue #274 by using recursive hash merge.
Merge pull request #282 from mediatemple/fix/master/merge_function

Fixes issue #274 by using recursive hash merge.