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

Conflicts:
	.vim/bundle/.neobundle/doc/tags
	.vim/bundle/.neobundle/install_info