Merge remote-tracking branch 'origin/master'

* origin/master:
  init: Speed up the untangling
  init: Unbind C-z if not running on a terminal
  init: Fix noweb-ref name

1 files changed, 2 insertions, 2 deletions

diff --git a/init.el b/init.el
index b841c11..902642d 100644
--- a/init.el
+++ b/init.el
@@ -1,5 +1,5 @@
 (let ((file-name-handler-alist nil))
   (package-initialize nil)
-  (setq package-enable-at-startup nil)
-
+  (setq package-enable-at-startup nil
+        org-babel-use-quick-and-dirty-noweb-expansion t)
   (org-babel-load-file "~/.emacs.d/init.d/main.org"))