Use org-mode version that comes with Emacs

Previously I was using an org-mode version from the git repo. These
changes remote this and this the org-mode version that comes with Emacs
will be used instead.