Fixup style problems.

* Collapsed main/main_with_config to one function
* Ignore -f when config arg is supplied in main
* Raise exceptions instead of sys.exit in load_config_from_file
* Fix tests for the updates