Major vimrc update