Updating config to support YAML, modifying key names for some config settings.