basic post merge working version
Swapped site title, more useful error on missing html/md/yaml tidier server mode