Various elpa and melpa changes.