Recover lost org-mode stuff; move other modes into setup file