config file now in YAML format.
Rationalise database names