Adding 'retriever help' subcommand back in.
Merge conflict.