vim: Enable/disable highlight depending on insert mode
Revert "vim: Disable search highlighting"

This reverts commit 1d1a9c8767d79b626706218634bc07593547f93c.

Conflicts:
	.vimrc
Merge remote-tracking branch 'origin/master' into mac