replacing YouCompleteMe with neocomplcache (easier to install on windows)
Fixing merge