Refactor configuration so that command line options and config file options are factored within same object.

* Update examples accordingly.