Added line numbers and disabled Youcompleteme
Merged