Use puppet defaults from Puppet Labs

Refactor puppet.conf to make it like the default puppet.conf shipped
with the Puppet Labs packages
Merge pull request #3 from ghoneycutt/refactor_puppet_conf

Use puppet defaults from Puppet Labs