Reverting some agent changes

Some configuration for puppet.conf's main section is already
done in manifests/init.pp. This commit restores that functionality.