Various .vimrc and .zshrc improvements