Merge pull request #356 from digitalmediacenter/fix_puppet_lint_errors