Removed bundle/ dir.  Let Vundle manage that
Fixed conflict in .vimrc caused by bad merge