MSysGit grep does not recognise the --color option. Vim status line.
Merge branch 'master' of github.com:PhilipDaniels/dotfiles

Conflicts:
	.bashrc