Change YCM conf
Merge branch 'master'

Local branch ahead of README revisions.
Change before presentation