Merge e6c047b (blackheaven/master)

Adding support to change only the visual mapping.

Conflicts:
	plugin/xptemplate.conf.vim