Clean up puppetagent.conf and repuppet templates