Zshrc clean up
vim changes, extract out macvim stuff to gvimrc