diff --git a/vim/settings/ctrlp.vim b/vim/settings/ctrlp.vim
index e8567f1..4817321 100644
--- a/vim/settings/ctrlp.vim
+++ b/vim/settings/ctrlp.vim
@@ -1,5 +1,10 @@
-let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
-let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files . --cached --exclude-standard --others']
+if executable('ag')
+  " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
+  let g:ctrlp_user_command = 'ag %s --files-with-matches -g "" --ignore "\.git$\|\.hg$\|\.svn$"'
+
+  " ag is fast enough that CtrlP doesn't need to cache
+  let g:ctrlp_use_caching = 0
+endif
 
 " Default to filename searches - so that appctrl will find application
 " controller