vimrcを更新
Merge branch 'master' of git://github.com/keyangu/dotfiles