start work on rendering templates with special layout delims
some fixes to get layouts working with config-cache
Merge remote-tracking branch 'origin/fixes'
clean up the cache