fix vimrc
Merge branch 'master' of github.com:yuya373/dotfiles

Conflicts:
  .vimrc