Merge branch 'HEAD'; branch 'master' of https://github.com/oahiroaki/dotfiles
update vimrc