cleaning up lint errors + tiny changes

Hi Josh, just a bit of cleanup for the new version of puppet-lint. If you want to merge, cool. If you don't, also cool.

For the CHANGELOG.md, that looks autogenerated by something. If so, I don't know by what. I did some googling but came up empty (there were some node.js things but they didn't look right).

Have a good day.

-Shawn
I think inheriting like you did is fine, and have a lot of modules that I made that still do it that way as well. 

The only reason I touch it now, is because puppet-lint complains and the CI server shows red (http://puppet-lint.com/checks/class_inherits_from_params_class/). Looks like the if statement I did isn't preferred either. I'll change it again to be the way puppet-lint wants.