diff --git a/bundle/bundle--lisp.el b/bundle/bundle--lisp.el
index 3c1d006c..a24889bb 100644
--- a/bundle/bundle--lisp.el
+++ b/bundle/bundle--lisp.el
@@ -31,6 +31,14 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
   ;; * (mapc 'require '(sb-bsd-sockets sb-posix sb-introspect sb-cltl2 asdf))
   ;; * (save-lisp-and-die "sbcl.core-for-slime")
 
+  ;; Stop SLIME's REPL from grabbing DEL,
+  ;; which is annoying when backspacing over a '('
+  (defun override-slime-repl-bindings-with-paredit ()
+    (define-key slime-repl-mode-map
+                (read-kbd-macro paredit-backward-delete-key) nil))
+
+  (add-hook 'slime-repl-mode-hook 'override-slime-repl-bindings-with-paredit)
+
   (setq common-lisp-hyperspec-symbol-table
         (concat common-lisp-hyperspec-root "Data/Map_Sym.txt"))
 
@@ -45,8 +53,8 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
             `((sbcl ("sbcl" "--noinform") :coding-system utf-8-unix)))))
 
   (defvar mk/slime-remote-instances
-    '((:machine-instance "u1-metalisp"
-			             :remote-host "u1.metalisp.dev"
+    '((:machine-instance "survey-metalisp"
+			             :remote-host "survey.metalisp.dev"
 			             :username "cl")
       (:machine-instance "u1-marcsukammer"
 			             :remote-host "u1.marcsukammer.dev"
@@ -371,7 +379,8 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
          (ielm-mode . paredit-mode)
          (lisp-mode . paredit-mode)
          (lisp-interaction-mode . paredit-mode)
-         (scheme-mode . paredit-mode))
+         (scheme-mode . paredit-mode)
+         (slime-repl-mode . paredit-mode))
   :bind (:map paredit-mode-map
-              ("M-)" . paredit-forward-slurp-sexp)
-              ("M-(" . paredit-forward-barf-sexp)))
+              ("M-s" . nil)
+              ("C-M-s" . paredit-splice-sexp)))