update setting for vim
Merge branch 'master' of github.com:sugilog/dotfiles

Conflicts:
	.vimrc