Update
Merge branch 'master' of git://github.com/avakhov/dotvim

Conflicts:
	update_bundles