Adding more command-line flags to cli

plus doing the refactor shuffle.
Cleaning up the uri/auth relationship

and (finally) getting rid of the "defaults" file/class.
Usage string touchup

including addition of YMMV warning