[VIM] Rearrange vimrc contents
[BASH] Convert grep alias to use GNU grep

The version of Grep that comes with Mac OS is ancient, and is best
replaced with the GNU version from Homebrew.