I've suffered from the same confusion, on finding that ELPA no longer worked for me with Aquamacs 2.0, I tried using the Marmalade repo with no joy.
Quite frustrating as I was using ELPA in my fork of the Aquamacs Emacs Starter Kit: https://github.com/evangineer/aquamacs-emacs-starter-kit