Update VIM
Update vundle
update
Merge remote-tracking branch 'origin/master'