Added :vimgrep mapping
Merge branch 'master' of github.com:glts/dotfiles

Conflicts:
	.vimrc