Cleaned up emacs config for 24.4.