puppet-lint conformation
Merge branch 'master' of https://github.com/rowlando11/puppet