Some emacs 24.4 changes (moving off of stable for a while)