  This function is mostly useful for variables that need to be set
 before packages are loaded. If you are unsure, you should try in setting them in
 `dotspacemacs/user-config' first."
+
+  ;; Allow exec-path-from-shell to run.  My fish config imports from .profile,
+  ;; but still fails this check since it includes 'set -x ...' in it.
+  ;; Note: this still doesn't seem to work.  Could be related to this issue:
+  ;; https://github.com/purcell/exec-path-from-shell/issues/55
+  (setq exec-path-from-shell-check-startup-files nil)
+
+  (with-eval-after-load 'org
+    ;; Setup org-babel language support
+    (require 'ob-python)
+    (require 'ob-screen)
+    (require 'ob-shell)
+
+    ;; The following options originated from:
+    ;; https://github.com/syl20bnr/spacemacs/issues/3439#issuecomment-149041391
+    (setq org-export-babel-evaluate nil)
+    (setq org-startup-indented t)
+    ;; increase imenu depth to include third level headings
+    (setq org-imenu-depth 3)
+    ;; Set sensible mode for editing dot files
+    (add-to-list 'org-src-lang-modes '("dot" . graphviz-dot))
+    ;; Update images from babel code blocks automatically
+    (add-hook 'org-babel-after-execute-hook 'org-display-inline-images)
+    (setq org-src-fontify-natively t)
+    (setq org-src-tab-acts-natively t)
+    (setq org-confirm-babel-evaluate nil)
+    )
   )
 
 (defun dotspacemacs/user-config ()


;; Do not write anything past this comment. This is where Emacs will
;; auto-generate custom variable definitions.

   ;; List of configuration layers to load.
   dotspacemacs-configuration-layers
   '(
     ;; Checkers
     spell-checking
     syntax-checking

     ;; Completion
     auto-completion
     helm

     ;; Source Control
     git
     version-control

     ;; Emacs
     org

     ;; Languages & Markup
     asciidoc
     emacs-lisp
     (go :variables
         gofmt-command "goimports"
         go-tab-width 4
         go-use-gometalinter t
         flycheck-gometalinter-tests t
         flycheck-gometalinter-vendor t
         flycheck-gometalinter-disable-all t
         flycheck-gometalinter-enable-linters '(
                                                "errcheck"
                                                "goconst"
                                                "golint"
                                                "ineffassign"
                                                "misspell"
                                                "vet"
                                                )
         )
     html
     javascript
     markdown
     rust
     shell-scripts
     vimscript
     yaml

     ;; Operating Systems
     nixos

     ;; Tools
     docker
     terraform
     tmux

     ;; Themes
     ;themes-megapack
     )
   ;; List of additional packages that will be installed without being
   ;; wrapped in a layer. If you need some configuration for these
