Updated to use puppet.conf to make changes easier