Upgrade to org-mode 8 from org package repo
Merge init files