diff --git a/.emacs b/.emacs
index c369dc1a8..50c8bdff1 100644
--- a/.emacs
+++ b/.emacs
@@ -39,6 +39,13 @@
 (ido-mode 1)
 
 ; Scala
+;; Load the ensime lisp code...
+(add-to-list 'load-path "ensime/elisp/")
+(require 'ensime)
+
+;; This step causes the ensime-mode to be started whenever
+;; scala-mode is started for a buffer. You may have to customize this step
+;; if you're not using the standard scala mode.
 (add-hook 'scala-mode-hook 'ensime-scala-mode-hook)
 
 ; Debug
@@ -51,7 +58,9 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(custom-safe-themes (quote ("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default))))
+ '(custom-safe-themes
+   (quote
+    ("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.vimrc b/.vimrc
index 68cf62758..9bf3d8f70 100644
--- a/.vimrc
+++ b/.vimrc
@@ -157,9 +157,9 @@ if has("autocmd")
 endif
 
 " Eclim Settings
-let g:EclimScalaSearchSingleResult = 'edit'
-let g:EclimCompletionMethod = 'omnifunc'
-let g:SuperTabDefaultCompletionType = 'context'
+" let g:EclimScalaSearchSingleResult = 'edit'
+" let g:EclimCompletionMethod = 'omnifunc'
+" let g:SuperTabDefaultCompletionType = 'context'
 map <C-Space> :ScalaSearch<CR>
 
 set wildignore=*.o,*~,*.pyc,*.class,\$global