Updated .emacs file to match emacs v24.