Added GREP_COLORS
Merge branch 'master' of github.com:rcgreenw/dotfiles