91e3f4cca6
Resolved a conflict between grep and go_pro (go_pro was added after grep). Adds @kernelsmith's grep command. Josh is determined to have msfconsole be his default shell, it seems. [Closes #1320] Conflicts: lib/msf/ui/console/command_dispatcher/core.rb