Updating for puppet lint

There are a few errors and warnings still reported, but they are
expected
Merge pull request #236 from hunner/lint_fixes

Updating for puppet lint