Massive vimrc updates