bufonly
Merge branch 'master' of https://github.com/jimmymain/vimfiles

Conflicts:
	.gitmodules