backmerge master
update
Merge
update
update
massive update
delete vim bundles
git ignore vim bundles
merge?