Added melpa; removed elpa and marmalade.