switch to using elpa/melpa and include org-mode