sync from im: use emacs for editor, ignore *~ when diff, update hosts