Updates vim bundles
Configures git merge tool, Kaleidoscope