diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index b049464..9d2d496 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -50,6 +50,9 @@
  '(make-backup-files nil)
  '(monky-process-type (quote cmdserver))
  '(mouse-buffer-menu-mode-mult 0)
+ '(mouse-wheel-progressive-speed nil)
+ '(mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control)))))
+ '(nrepl-use-ssh-fallback-for-remote-hosts t)
  '(omnisharp-server-executable-path nil)
  '(org-export-backends (quote (ascii html icalendar latex md odt)))
  '(org-export-with-toc nil)
@@ -89,6 +92,9 @@
  '(show-paren-style (quote parenthesis))
  '(tab-width 4)
  '(tags-revert-without-query t)
+ '(tramp-completion-reread-directory-timeout nil nil (tramp))
+ '(tramp-default-method "sshx" nil (tramp))
+ '(tramp-use-ssh-controlmaster-options nil nil (tramp))
  '(transient-mark-mode t)
  '(truncate-lines t)
  '(typescript-indent-level 2)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8f5801b..867a572 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -898,4 +898,17 @@
   (unless (member "TARGETS" clojure-build-tool-files)
     (setq clojure-build-tool-files (append clojure-build-tool-files '("TARGETS")))))
 
+;; ================================================================
+;; TRAMP
+;; ================================================================
+(require 'tramp)
+;; Since we're going to be doing this a lot, the minibar message
+;; tramp spits out for every file access is both spammy, distracting,
+;; and often hides more relevant messages.
+(setq tramp-message-show-message nil)
+;; Let tramp search $PATH as given to the $USER on the remote machine
+;; (necessary to find 'hphpd' for instance)
+(add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+
+
 ;;; init.el ends here