Update to .zshrc and significant rewrite of .vimrc