Added colour support for grep
Merge branch 'master' of github.com:dbye/oh-my-zsh