Merging opscode cookbooks with ours