Added AutoVundle functionality that I found in an article
Fixed merge conflict with .vimrc and .bashrc