--- a/vim/vimrc	Sun Mar 02 17:20:02 2014 -0500
+++ b/vim/vimrc	Wed Mar 12 00:55:58 2014 -0400
@@ -712,7 +712,11 @@
             \ 'defquery',
             \ 'defqueries',
             \
+            \ 'defform',
+            \
             \ 'deferror',
+            \ 'when-found',
+            \ 'when-valid',
             \
             \ 'defroutes'
             \ ]
@@ -732,6 +736,9 @@
     au FileType clojure compiler clojure
     au FileType clojure setlocal report=100000
 
+    " Things that should be indented 2-spaced
+    au FileType clojure setlocal lispwords+=when-found,defform,when-valid
+
     au FileType clojure RainbowParenthesesActivate
     au syntax clojure RainbowParenthesesLoadRound
     au syntax clojure RainbowParenthesesLoadSquare