Add vundle, do some clean up