Fixes #4 and moves GREP_OPTIONS to an alias
Merge branch 'master' of github.com:derintendant/dotfiles