kristen's updates to vimrc and zsh
Merge branch 'master' of github.com:kristenwidman/dotfiles