YouCompleteMe annoyed me
Something
set ts=20
Merge branch 'master' of github.com:jjfiv/vim-repo

Conflicts:
	.gitmodules