Add deep-merge to merge nested maps
Switch to a single tree in a manifest

Also added super-basic manifest fetch/restore to storage. This is a
bodge so I can properly back up my desktop.