Added templating
Remove the cvim templating - now using a separate templating plugin
Added spellings
Merged bundles