Use yaml's merge_struct to simplify parsing

[janniklasrose]

First need to verify that merge_struct does the same as the old code for a range of yaml files