update templates to use instance variables
puppet-lint tests
Merge pull request #1 from arguello/tb/development

update templates, puppet-lint