config file requires package.
fix lint errors
Merge branch 'pahoughton-devel' of github.com:pahoughton/puppet-master into pahoughton-devel