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

Conflicts:
	.vim/bundle/neobundle.vim
	.vimrc