vimrc update
Merge branch 'master' of github.com:toyamarinyon/dotfiles
vimrc update