Reorganize/redesign configuration

Right now there is no clear concept behind what configuration options are set using the config file, command line options or both. It should probably either be both for all options or someone should go over all options and consciously decide which ones go where.