Merge branch 'master' of github.com:curipha/dotfiles
GREP_OPTIONS is now deprecated (from grep v2.21)