huga
Merge branch 'master' of https://github.com/alpaca-tc/dotfiles

Conflicts:
  .vim/vimrc
huga
Merge branch 'master' of github:alpaca-tc/dotfiles
huga