Various changes to .emacs so that it works on emacs 24.3.1