vimfiles moved
Merge branch 'master' of https://github.com/mnishi/my-vimrc-for-windows

Conflicts:
	_vimrc