Misc vimrc improvements