Most options now specified by configuration file.
Merge branch 'configfile' into develop