upgrading to emacs 24.4, had to move things around