Add 'grep' subcommand.
Merge branch 'grep'