Log Message: Add emacs24. Change the logic for emacs-snapshot to be emacs25, which it presumably will be once the necessary upstream stuff appears.