Issue 336

These patches consolidate parsing the command line options in ConfigManager.