Now configuration can be broken across multiple files.  Moved some command line options into this module.