Yamldiff

this looks pretty much done. merge it to master. The only changes here are in contrib/cli_scripts