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

Conflicts:
	vimrc