Add support for merge keys.#300

Ortham wants to merge 2 commits intojbeder:masterjbeder/yaml-cpp:masterfrom

loot:merge-key-supportloot/yaml-cpp:merge-key-supportCopy head branch name to clipboard