Merge pull request #220 from justinstoller/puppet_lint