Some general improvements to our vimrc