Added vimrc for MacVim, updated zshrc