Merge in tweaks from current Gondor version.  Primarily that subcommands are called Subcommand now and exit codes are handled.