Add resource merging for the `directory` resource.
Merge branch 'master' of github.com:facetdigital/chef_resource_merging