Makefile: respect DESTDIR fully
Adding diffuse(1) merge plugin
Adding symlink to make pylint happy
Adding tkdiff merge plugin
Adding xxdiff merge plugin