Puppet-lint fixes

Cleaning up whitespace and variable enclosure errors