Linting changes

I made some changes to fix lint errors I was receiving. The biggest changes are undoing inheritance of the params class, as documented here:
http://puppet-lint.com/checks/class_inherits_from_params_class/

Aside from a couple variables that needed including, I didn't see any major reasons to keep the inheritance. Look ok?