.vimrcを修正
Merge branch 'master' of github.com:matope/dotfiles-vim

Conflicts:
	.vimrc