vim
Merge branch 'master' of github.com:kek/config

Conflicts:
	vim/rc