- Changed grep command in VIM
Merge branch 'master' of github.com:notmii/.files

Conflicts:
	vimrc