merge vim-kaoriya version on bitbucket