Revert "Use Marmalade repo instead of MELPA"

This reverts commit cb4446e5314cd296fde1925852a0dd10f348f90e.

MELPA builds directly from upstream, while Marmalade is waiting
for new releases. So MELPA is more up to date.