snapshot
Merge branch 'master' of https://github.com/mtklein/bin

Conflicts:
	git-vim