Added some ediff customizations