Used puppet-lint to cleanup some items in the manifest file that do not conform to Puppet's official Style Guide: http://docs.puppetlabs.com/guides/style_guide.html
Merge pull request #1 from davidpellerin/puppet-lint-cleanup

puppet-lint cleanup