Clean up zshrc. Expand vimrc