Added org-mode settings
update merge