Simplify literal search mapping to allow incsearch.

(cherry picked from commit 068a5d471a51367e3106a9255f98aab262a091a8)

Conflicts:
	.vimrc