Default setting is default
Move CLI option parsing to separate file
Reference SCM by name instead of class
Test CLI-args-to-config parsing logic directly

Note that this leaves behind a few integration-style tests for now