Added melpa and marmelade