added script to use ediff as a merge tool
pretty comment boxes
find emacsclient in more generality