getting server side html templates working.
Merge remote-tracking branch 'github/master'
some config updates