updated templates to correctly reference local scoped variables and avoid deprecation warnings in newer versions of puppet
Merge pull request #21 from rsnapp/master

Puppet version 3.2.1 has deprecated variable access warnings.