Fix Puppet 3.2.1 deprecation warnings

Puppet 3.2.1 has deprecated 'foo' as a means of accessing variables in
templates instead now requiring '@foo' and will log warnings about this.

This commit changes the templates accordingly