Miscellaneous vimrc updates