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
Hehe, whitespace looks terrible in my editor, At my $dayjob we crusade against whitespace. I'll revert this change as well. :)