# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1417364284 28800
# Node ID 627ef715230769bb65fa7b3722f2e0c93347450f
# Parent  073e7e47dbebaf009cf54e1c55677076fad591e6# Parent  ee5863ae54e70d80405c074932d49dee7aa05275
Merge changes.

diff -r ee5863ae54e7 -r 627ef7152307 .hgsubstate
diff -r ee5863ae54e7 -r 627ef7152307 vim/vimrc
--- a/vim/vimrc	Thu Nov 20 12:01:28 2014 -0800
+++ b/vim/vimrc	Sun Nov 30 08:18:04 2014 -0800
@@ -224,7 +224,7 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build|static|node_modules)$'
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|static|node_modules|_cache|_counter)$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.