# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1385007990 28800
# Node ID 501de71d020e368ae5caadece069531e5aa29215
# Parent  0cf7d2e05865becf7ec1ca674bf98d740adb4366# Parent  2e1f9a40a36acfe52c599a8782242299d07de33e
Merged changes.

diff -r 2e1f9a40a36a -r 501de71d020e .hgsubstate
--- a/.hgsubstate	Sun Oct 20 20:57:50 2013 -0400
+++ b/.hgsubstate	Wed Nov 20 20:26:30 2013 -0800
@@ -1,24 +1,24 @@
 f8703c9e2fb951ebb193b268faf7f0457abf8334 lib/hg/allpaths
-a3c3b8077cbeec7c381a4b312d722d575a738610 lib/hg/hg-git
+5f00e72ac3dfce6d9e627c11392b6441ee48b858 lib/hg/hg-git
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 b8e07a24e77d3bad16a89bde409f97ccc307486a vim/bundle/badwolf
-199924c0171bf7e52c832c2f5b26f7e0b13dfa73 vim/bundle/colorschemes
+f134dd5726732a74e05edacc9a795006b984b82f vim/bundle/colorschemes
 a3ae0df1d9e13941e9e8086637055841ce93f7bd vim/bundle/commentary
-c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp
+b5d3fe66a58a13d2ff8b6391f4387608496a030f vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
-a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 vim/bundle/fugitive
-8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo
-9a891ed78a4b222e8c710e533e0d1f21259c0ef1 vim/bundle/haml
-8c9aca0e4322f56bce43204a172f9d18b67f0cc2 vim/bundle/lawrencium
-d605010cab695dca64c5cd9bf8bbcc8db9864815 vim/bundle/less
-dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
-a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
+124550cfee33a1bb9a227e78ccc709317a89dae9 vim/bundle/fugitive
+eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo
+33279476a63276cf5858a568283407dd98d7eb74 vim/bundle/haml
+16e873b2a4a8421fcbcf9a1b57ee0bbfe6bbe358 vim/bundle/lawrencium
+020f0747eaa3a8220b7dbbc529e7f35523f364a0 vim/bundle/less
+fccf76f68fa819629e9dac50a20f3369983e2a38 vim/bundle/markdown
+b0bb781fc73ef40365e4c996a16f04368d64fc9d vim/bundle/nerdtree
 af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
-2f639ea61ab037e7862228d54a1c292f59c2385f vim/bundle/ragtag
-d75a544b786710705f0db0d8d8fd66ca4a5a7239 vim/bundle/repeat
+1a93cbb14f537c001a52a43b94309d6c625b5953 vim/bundle/ragtag
+a81bef76031ca1c71766b516417480caeb01c932 vim/bundle/repeat
 528a59f26d12278698bb946f8fb82a63711eec21 vim/bundle/solarized
-ee35ab6954a11337a2b52003d07fabe442843b68 vim/bundle/supertab
-1a73f607f8f5477d6942df2eb6e7245c4864f4d3 vim/bundle/surround
-e5dfcc3488e407c8e28b308cb6e631336e77d060 vim/bundle/syntastic
+7a32e0866bfea26cf7781935289df131d1d0c0e0 vim/bundle/supertab
+42e9b46e7a20a2f394664874c7bbd9d6f6c39e8a vim/bundle/surround
+7d24ad678ff6b07b402beb97ce9eb7407a9e84b2 vim/bundle/syntastic
 b9d1fa7d460dac878cbc8c945a45439d92ce0cb2 vim/bundle/vimroom
diff -r 2e1f9a40a36a -r 501de71d020e vim/vimrc
--- a/vim/vimrc	Sun Oct 20 20:57:50 2013 -0400
+++ b/vim/vimrc	Wed Nov 20 20:26:30 2013 -0800
@@ -126,7 +126,7 @@
 " Better command-line completion, but don't show some
 " stuff we don't care about.
 set wildmenu
-set wildignore+=.DS_Store,Thumbs.db,*.so,*.dll,*.exe
+set wildignore+=.DS_Store,Thumbs.db,*.so,*.dll,*.exe,*.pyc,*.pyo
 
 " Always display the tab-page line.
 set showtabline=2
@@ -221,8 +221,7 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv)$',
-  \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$'
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build)$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
diff -r 2e1f9a40a36a -r 501de71d020e vimperatorrc
--- a/vimperatorrc	Sun Oct 20 20:57:50 2013 -0400
+++ b/vimperatorrc	Wed Nov 20 20:26:30 2013 -0800
@@ -32,6 +32,9 @@
 nnoremap <leader>p <S-Esc><A-D-\>
 nnoremap <leader>b I<A-b>
 
+" Quickly hide search highlighting
+nnoremap <leader><Space> :noh<cr>
+
 " Super minimal UI
 set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs