diff --git a/emacs b/emacs
index a05236e..5e367d4 100644
--- a/emacs
+++ b/emacs
@@ -26,6 +26,7 @@
 (setq inhibit-startup-message t)
 (setq make-backup-files nil)
 (global-subword-mode 1)
+(global-auto-revert-mode)
 
 ;; map cmd to meta (Emacs.app 23.2)
 (when macosx-p
diff --git a/emacs.d/textmate.el b/emacs.d/textmate.el
index fbd7e3b..821db27 100644
--- a/emacs.d/textmate.el
+++ b/emacs.d/textmate.el
@@ -272,6 +272,11 @@ Symbols matching the text at point are put first in the completion list."
            (position (cdr (assoc selected-symbol name-and-pos))))
       (goto-char (if (overlayp position) (overlay-start position) position)))))
 
+;; this is from rails-lib.el in the emacs-rails package
+(defun string-join (separator strings)
+  "Join all STRINGS using SEPARATOR."
+  (mapconcat 'identity strings separator))
+
 (defun textmate-goto-file ()
   "Uses your completing read to quickly jump to a file in a project."
   (interactive)