Get ediff symbols in on load

The ediff stuff kinda fails unless the module is loaded, so requiring it before we start changing variables and calling routines makes things much happier