Additional HTML container groups

Add additional HTML container groups so mustache matches are displayed
properly within them.
Better handlebars variable highlighting
Change to html filetype for matchit support