rename option name
Merge branch 'master' of https://github.com/saneyuki/vim-config
Remove duplicate config from gvimrc.