Move to MELPA, and fixed all the ensuing brokenness

Upgrading to the tip is painful...