tree reconciliation needs to handle YAML blocks better

[cscheid]

We need to preserve !str tags, key ordering, non-canonical writes, etc etc.