New shiny Ediff integration

(I will try to later provide some details here and/or at https://github.com/magit/magit/wiki/FAQ)