Misc vimrc changes