diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index cb49bb1..224e9bc 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -157,3 +157,6 @@
 ;; this doesn't work for revert, I don't know
 (add-hook 'after-revert-hook 'ztl-on-buffer-demodification)
 (add-hook 'first-change-hook 'ztl-on-buffer-modification)
+
+(autoload 'ansi-color-for-comint-mode-on "ansi-color" nil t)
+(add-hook 'shell-mode-hook 'ansi-color-for-comint-mode-on)
diff --git a/.vimrc b/.vimrc
index a68b020..5efcf63 100644
--- a/.vimrc
+++ b/.vimrc
@@ -60,7 +60,7 @@ runtime macros/matchit.vim
 autocmd FileType ruby,eruby set omnifunc=rubycomplete#Complete
 autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 "autocmd FileType python set omnifunc=pythoncomplete#Complete
-autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
+"autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
 let python_highlight_all = 1
 let g:Tb_MaxSize=0
 let g:Tb_MapCTabSwitchBufs = 1
@@ -269,6 +269,9 @@ if g:google != 0
     " Run update_deps on the target for the current file.
     nmap <Leader>bu :call UpdateDepsDwim()  
   endif
+  " Configure a 'Comments' command to import CL code review comments into the
+  " quickfix buffer.
+  command! Comments cexpr system('git5 comments -q -u')
 endif
 
 if filereadable("/home/build/nonconf/google3/tools/tags/gtags.vim")