mingle arguments and configfile options.
Merge branch 'master' into moreConfigFileOptions
Only work on the top level options for now.
Merge branch 'master' into moreConfigFileOptions
Merge pull request #56 from tadpol/moreConfigFileOptions

More config file options