Various changes to cleanup code. Follow the style guide.

These changes fix various puppet-lint warnings and adds a header to template files I find particular useful.