Fix the rest of the templates for puppet 3.2
Merge pull request #8 from bobtfish/fix_templates_for_32

Fix the templates for puppet 3.2 deprecation warnings