updated to most recent version of vundle
merge