first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
  .vim/bundle/.neobundle/doc/tags
  .vim/bundle/.neobundle/install_info
  .vim/bundle/.neobundle/tags_info
  .vimrc
  .zshrc
  .zshrc.mine