youcompleteme
fixed conflict
added surround.vim