Updated setup for org-mode based on ideas in the manual and http://doc.norang.ca/org-mode.html