Updated most vimrc changes