More .vimrc improvements