Added vundle to vimrc
fixed conflict