Switch to vundle, various other fixes