vimrc structure changes, zshrc alias changes