ADDED MELPA and updated; possibly broke magit