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

Conflicts:
  .vim/dict/ruby.dict
  .vim/snippet/ruby.buildin_library.snip
  .vim/snippet/ruby.rspec.snip
  .vim/vimrc