initial checkin
Merge branch 'master' of github.com:aronchick/dotfiles

* 'master' of github.com:aronchick/dotfiles:
  updating zsh and vim bundles
most recent update
updating
fixing merge