Port minibuffer behaviour fixing
Add ediff configuration