Colour grep results
Merge branch 'master' of https://github.com/nickdtodd/dotfiles