* Switch to ERB by default on new sites, config YAML optional

* fix rebase glitch

* Major refactor of template engine converters

* First round of updated tests

* Many bug fixes, all tests passing

* fix bad merge