don't track vim
drop these
clean up
Merge branch 'master' of https://github.com/mtklein/configs

Conflicts:
	vimrc