More .vimrc cleanups