Merge branch 'master' of https://github.com/KazuakiM/dotfiles
Update highlight for gVim