.emacs updated for marmalade