grep
Merge branch 'master' of github.com:zhengkai/vimrc

Conflicts:
	.vimrc