?
Merge branch 'master' of https://github.com/TheBB/vimconf

Conflicts:
	vimrc