enable syntax highlighting within org-mode files
Added org and htmlize to the default packages
Fix merge conflicts