Lint

- Have puppet-lint ignore packages.pp and Apache's mods.pp.
- Alignment / spacing tweaks for conformity with puppet-lint style.

Change-Id: I54bf3e36d5344f4eb1df32387537eb4b8ea47950