Fix config parse error.  Move markup into template dir - leaving as .html since it actually contains meta data and can render as such.  Few minor tweaks/fixes for earlier templating.