設定を整理。(if文を減らす)
Merge branch 'master' of github.com:py0n/dotfiles-vim

Conflicts:
	vimrc