Add some cpp/scala settings.
Merge remote-tracking branch 'origin/master'

Conflicts:
	after/ftplugin/cpp.vim
Add a way to disable YCM locally.