Change ediff-window-setup-function to not use separate frame

Don't open a separate frame for the ediff control buffer, even when running
Emacs in graphical mode.