updates for emacs 25 and new job