Making template vars consistent
Merge pull request #42 from dhensby/patch-2

Making Template vars explicit