for good measure
Merge branch 'master' of https://github.com/AtsushiSakai/myvim

conflict reslove

Conflicts:
	.vimrc