More .vimrc cleanup