Make ediff work better

When it quit, the main emacs frame should be brought to focus.