Minor improvements to vimrc