Move old vim dir + vimrc out of the way first.