# HG changeset patch
# User Ludovic Chabant <ludovic@chabant.com>
# Date 1388806737 28800
# Node ID 254c4f068808d38b6e420e09b9169ddfa2a3b8fe
# Parent  2eca71d533ce0e2244abd94c3fedd162fd999efd# Parent  967328f9896b0c0c8adb22ddb38c9abf498ec98c
Merged changes.

diff -r 2eca71d533ce -r 254c4f068808 vim/vimrc
--- a/vim/vimrc	Fri Jan 03 19:36:33 2014 -0800
+++ b/vim/vimrc	Fri Jan 03 19:38:57 2014 -0800
@@ -221,14 +221,14 @@
 
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
-  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|node_modules|build)$'
+  \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv|build|node_modules)$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
 " Use `pyflakes` with `syntastic`.
-let g:syntastic_python_checkers = ['pyflakes']
+let g:syntastic_python_checkers = ['pyflakes', 'pylint']
 
 " Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
diff -r 2eca71d533ce -r 254c4f068808 vimperatorrc
--- a/vimperatorrc	Fri Jan 03 19:36:33 2014 -0800
+++ b/vimperatorrc	Fri Jan 03 19:38:57 2014 -0800
@@ -45,4 +45,8 @@
 " Super minimal UI
 set toolbars=noaddons,nobookmarks,nomenu,nonavigation,notabs
 
+" Websites with useful keyboard shortcuts already
+ignorekeys add -except=:,J,K,b fastmail.fm
+ignorekeys add -except=:,J,K,b feedly.com
+
 " vim: ft=vim