Factor loads command-line options into config files.
Merge pull request #571 from mozilla/rfk/loads-config-file

Factor loads command-line options into config files.