Fixed Pi's mod_php issue and added a template for non-master puppet.conf