Use vimdiff as my mergetool
Update clang_complete plugin settings and plugin