vim 搜索高亮
Merge branch 'master' of https://github.com/lrtfm/configure

Conflicts:
	vimrc