Revert YouCompleteMe and add Jedi back