Merge pull request #315 from happytodesign/development

Remove template_vars