Adding Cake YAML Support for YAML Merge#1

Merged

Redth merged 2 commits intocake-contrib:masterfrom DaveDiehl:mergesupport

May 4, 2017

+104-8

Commits on Apr 10, 2016

Updated DeserializeMerge From File to use MergingParser which allows Yaml Alias to use Merge Tag
DaveDiehl
committed
Allow YAML merge from string
DaveDiehl
committed