Use Ctrl-L to clear the highlighting of :set hlsearch
Merge branch 'master' into vim_plugins

Conflicts:
	vimrc