Reorganized mcollective client/agent cfg + added features