Vundle update and other changes