Remove youcompleteme
Install vim-jdaddy
Merge branch 'master' into macosx