Clean up exposed API

- Marked do_* functions as private.
- Renamed command-line processing to parse_args, will accept alternative
  set of arguments
Add help strings for command-line options
Fix command line overrides

- 'client-token' override was missing
- overrides for names containing dashes were broken because of how
  attributes are actually named...