Change to --config option to take multiple YAMLs

The second and subsequent files supplied to --config on the command line
are merged into the first, using the same mechanism for including files
within the YAML itself.