Puppet-lint fixes
Merge pull request #327 from hundredacres/master

Puppet-lint fixes