Move back to org-mode from elpa

Avoid needing to compile version from git.