Restructure zshrc, some vimrc changes