vimrc changes with gvimrc (moved back to MacVim), and small zshrc updates