Fixing breakages caused by Vundle upgrade