YouCompleteMe.
Merge branch 'master' of github.com:soasme/soasvim

Conflicts:
	vimrc