More .vimrc fixes.