Disable marmalade
Add new packages
Add magit