Fix missing @ on template variables
Merge pull request #7 from rfay/20140318_fix_templates_with_variables

Fix missing @ on template variables