Add YouCompleteMe bundle
Update README.md
Fix conflict