Merge pull request #571 from robbyt/master

fix puppet-lint errors
clean more whitespace