big update because emacs 24 trunk -> emacs 24 somewhat stable is a bitch