hue
Merge branch 'master' of github:alpaca-tc/dotfiles

Conflicts:
  .vim/vimrc
  secret