auto-accept default merge message
Merge branch 'master' of github.com:cenkalti/dotfiles

* 'master' of github.com:cenkalti/dotfiles:
  add vimrc
  update zsh
hosts