Moved around some org-mode config into the use-package declaration.