diff --git a/emacs/jupp.el b/emacs/jupp.el
index cd96833..ed55685 100644
--- a/emacs/jupp.el
+++ b/emacs/jupp.el
@@ -21,8 +21,15 @@
             (add-to-list 'load-path erlang-emacs-dir)
             (setq erlang-root-dir "/usr/local/Cellar/erlang/R14B04")
             (setq exec-path (cons "/usr/local/Cellar/erlang/R14B04/bin" exec-path))
-            (require 'erlang-start)))
-
+            (require 'erlang-start)
+            (require 'erlang-eunit)
+            (add-hook 'erlang-mode-hook
+                      '(lambda ()
+                         (local-set-key (kbd "C-c C-t")
+                                        '(lambda ()
+                                           (interactive)
+                                           (save-buffer)
+                                           (erlang-eunit-compile-and-run-module-tests)))))))
 
 ; window startup size
 (add-to-list 'default-frame-alist '(left . 70))
@@ -56,4 +63,8 @@
 (setq-default tab-width 2)
 (setq-default indent-tabs-mode nil)
 (setq-default c-basic-offset 4)
-(setq-default ruby-basic-offset 2)
\ No newline at end of file
+(setq-default ruby-basic-offset 2)
+
+; start edit server, allows to edit stuff in browser in emacs
+(require 'edit-server)
+(edit-server-start)
diff --git a/support/vendor/emacs-prelude b/support/vendor/emacs-prelude
index 11752ff..11f57e7 160000
--- a/support/vendor/emacs-prelude
+++ b/support/vendor/emacs-prelude
@@ -1 +1 @@
-Subproject commit 11752ffc44a8f66074e57816ea4b2f52c0897b04
+Subproject commit 11f57e7fbf6e4e09acb72b5ac42735ed1936aa8f