Added puppet.conf and cleaned up