Revamped vundle and vim