Update vundle version, and some adjustments