runtime choosing of ycm or omnicomplete
Merge branch 'completion-merge' into ycm