Puppet lint fixes

Leave it cleaner than you found it,  I disagree with the split the line
at 80 characters always requirement, especially for splits in the middle
of commands like this one, so I've left it alone.  Should you disagree
strongly please feel free to add a commit to this PR.