Initial org-mode settings. Not much here.
Some extra org-mode settings, fix merge conflict.