update catalog and generate_catalog
update emacs-conf.el
update git-erase-keychain