Some improvements to the vimrc