Upstream org changes
Removed setting of org-directory

Now that smart-mode-line has been corrected