Fixed my-restart-shell to prevent erroneous default-directory. Various
org-mode changes.