dbda09a75160

--- a/.hgrc	Wed Jul 13 16:50:22 2011 -0400
+++ b/.hgrc	Fri Jul 15 10:04:21 2011 -0400
@@ -117,6 +117,7 @@
 cus = commit -m 'Update subrepository state.'
 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
 cmm = commit -m 'Merge.'
+cws = commit -m 'Whitespace.'
 
 mergelocal = !$HG --config ui.merge=internal:local merge $@
 mergeother = !$HG --config ui.merge=internal:other merge $@

--- a/dotjs/google.com.js	Wed Jul 13 16:50:22 2011 -0400
+++ b/dotjs/google.com.js	Fri Jul 15 10:04:21 2011 -0400
@@ -1,5 +1,5 @@
 $(function() {
-    var css = ".vspib, .vspi {display: none;} #vspb {display: none;}";
+    var css = ".vspib, .vspb, .vspi {display: none;} #vspb {display: none;}";
     if (typeof GM_addStyle != "undefined") {
         GM_addStyle(css);
     } else if (typeof PRO_addStyle != "undefined") {

--- a/vim/.vimrc	Wed Jul 13 16:50:22 2011 -0400
+++ b/vim/.vimrc	Fri Jul 15 10:04:21 2011 -0400
@@ -449,6 +449,9 @@
 nnoremap <leader>ev <C-w>s<C-w>j<C-w>L:e $MYVIMRC<cr>
 nnoremap <leader>es <C-w>s<C-w>j<C-w>L:e ~/.vim/snippets/<cr>
 nnoremap <leader>eo <C-w>s<C-w>j<C-w>L:e ~/Dropbox/Org<cr>4j
+nnoremap <leader>eh <C-w>s<C-w>j<C-w>L:e ~/.hgrc<cr>
+nnoremap <leader>em <C-w>s<C-w>j<C-w>L:e ~/.mutt/muttrc<cr>
+nnoremap <leader>ez <C-w>s<C-w>j<C-w>L:e ~/lib/dotfiles/zsh<cr>4j
 
 " }}}
 " Convenience mappings -------------------------------------------------------- {{{
@@ -512,6 +515,7 @@
 nnoremap <leader>T :!ctags -R -f ./tags .<cr>
 
 " Easy filetype switching
+nnoremap _md :set ft=markdown<CR>
 nnoremap _hd :set ft=htmldjango<CR>
 nnoremap _jt :set ft=htmljinja<CR>
 nnoremap _cw :set ft=confluencewiki<CR>

--- a/zsh/misc.zsh	Wed Jul 13 16:50:22 2011 -0400
+++ b/zsh/misc.zsh	Fri Jul 15 10:04:21 2011 -0400
@@ -77,3 +77,7 @@
 alias dvt='dtach -A /tmp/dvtm-session.sock -r winch dvtm -m "^f"'
 
 alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*'
+
+function fack () {
+    find . $@ | grep -v '/\.hg\|/\.git'
+}