Tidy up config options

Notably, the owner config param needed to allow it to not be specified
on the command line when it's specified in the config file.