Descriptive text about config.yaml, made inclusion of config.yaml optional, changed it to a deep merge