bring back ensime & fix ediff display (full-screen)