- added private
- fixed emacs header
- added ediff mergetool as described in http://stackoverflow.com/a/1818855/446256