Change wrap/search remaps
Merge branch 'master' of github.com:maverick2000/vim3000

Conflicts:
	vimrc