bash-completion: Use grep -E instead of deprecated egrep
bash-completion: Update command and option lists, sort in same order as --help