Add marmalade as well.
Add all the upgraded emacs dependencies.