Revert "Merge branch 'trial-vim-nerdcommenter' into trial"

This reverts commit dee613c1f8fa732364ed50901ff07ab1127096ef, reversing
changes made to 55d4072123ffe50fbae348a61be8db5af7fca6e3.

Conflicts:
	vim/_vimrc
Revert "Merge branch 'trial-vim-surround' into trial"

This reverts commit f83b3dd3746f2db830cfe4d973a662a985c55eff, reversing
changes made to dee613c1f8fa732364ed50901ff07ab1127096ef.

Conflicts:
	vim/_vimrc

not using.