updated vimrc and zshrc
Merge branch 'master' of https://github.com/TaliMy/dotfiles