Cleanup tempalte variable access
Puppet-lint suggested cleanup
Version bump
Merge branch 'template_cleanup'