Assorted changes to vimrc