Minor config changes.
Wrapping changes in emacs.org; moved old Org-mode config out.