1287b23ee8c3

--- a/.hgsub	Sat Feb 04 14:26:38 2012 -0500
+++ b/.hgsub	Mon Feb 13 09:10:28 2012 -0500
@@ -1,7 +1,7 @@
-mercurial/templates = [hg]http://bitbucket.org/sjl/mercurial-cli-templates
+mercurial/templates = [hg]https://bitbucket.org/sjl/mercurial-cli-templates
 
 vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
-vim/bundle/gundo = [hg]http://bitbucket.org/sjl/gundo.vim/
+vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/
 vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
 vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
 vim/bundle/vim-commentary = [git]git://github.com/tpope/vim-commentary.git
@@ -10,13 +10,13 @@
 vim/bundle/sparkup = [git]git://github.com/sjl/vim-sparkup.git
 vim/bundle/syntastic = [git]git://github.com/scrooloose/syntastic.git
 vim/bundle/vim-javascript = [git]git://github.com/pangloss/vim-javascript.git
-vim/bundle/strftimedammit = [hg]http://bitbucket.org/sjl/strftimedammit.vim/
+vim/bundle/strftimedammit = [hg]https://bitbucket.org/sjl/strftimedammit.vim/
 vim/bundle/easymotion = [git]git://github.com/Lokaltog/vim-easymotion.git
 vim/bundle/ctrlp = [git]git://github.com/kien/ctrlp.vim.git
 vim/bundle/vim-orgmode = [git]git://github.com/jceb/vim-orgmode.git
 vim/bundle/python-mode = [git]git://github.com/sjl/python-mode.git
-vim/bundle/slimv = [hg]http://bitbucket.org/sjl/slimv
-vim/bundle/threesome = [hg]http://bitbucket.org/sjl/threesome.vim
+vim/bundle/slimv = [hg]https://bitbucket.org/sjl/slimv
+vim/bundle/threesome = [hg]https://bitbucket.org/sjl/threesome.vim
 vim/bundle/vim-makegreen = [git]git://github.com/sjl/vim-makegreen.git
 vim/bundle/vim-coffee-script = [git]https://github.com/kchmck/vim-coffee-script.git
 vim/bundle/supertab = [git]git://github.com/ervandew/supertab.git
@@ -28,5 +28,6 @@
 vim/bundle/AnsiEsc.vim = [git]git://github.com/vim-scripts/AnsiEsc.vim.git
 vim/bundle/powerline = [git]git://github.com/Lokaltog/vim-powerline.git
 vim/bundle/yankring = [git]git://github.com/vim-scripts/YankRing.vim.git
+vim/bundle/badwolf = [hg]https://bitbucket.org/sjl/badwolf/
 
 keymando/Plugins/abbrev = [git]git://github.com/keymando/abbrev.git

--- a/.hgsubstate	Sat Feb 04 14:26:38 2012 -0500
+++ b/.hgsubstate	Mon Feb 13 09:10:28 2012 -0500
@@ -2,10 +2,11 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 a41d5d52c39a31128e969e69acf800b198cb07f9 vim/bundle/ack
-420174fc537ba986a716964db7af0bd189252944 vim/bundle/ctrlp
+9d9e466f24c36dc707e862d90a93f6c1a277a41d vim/bundle/badwolf
+93cb20dbfbab723e1557801469ae70f4f46499da vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
 b4b75ef682da3e946c648d3634ade39d0af49aba vim/bundle/fugitive
-2a78f151df54b53874f0aa6a85cfdad6ead224ed vim/bundle/gundo
+a860f15c7226ee5b352303c5032732a423409932 vim/bundle/gundo
 4ef2d418f48d30fed2f7ce00f598d6871a0010fe vim/bundle/html5
 78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
 75ab8c11b56aae8e35f211d96fb008efb1ab946a vim/bundle/linediff
@@ -15,7 +16,7 @@
 4df0cdc009e590c1d6ec32a2a3c12ff8deeb6f25 vim/bundle/powerline
 67033ee4b9ee6d4916752da5e360b65ddf2fb525 vim/bundle/python-mode
 fa3563dda862c1dc46ddac32d8a9f939e9077379 vim/bundle/rainbow-parentheses
-f5b2b1945dd65b0a3a6d75f9e8cdfe32011a180d vim/bundle/slimv
+5dfc238d0bbb93cf5744bf3985ec1a653ef686ca vim/bundle/slimv
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 6eec2c131213850ed65fd6da494dfd1a0d620a4e vim/bundle/strftimedammit
 ac395b57fec47f034cba151d01669d134ac7041b vim/bundle/supertab

--- a/.pentadactylrc	Sat Feb 04 14:26:38 2012 -0500
+++ b/.pentadactylrc	Mon Feb 13 09:10:28 2012 -0500
@@ -8,8 +8,8 @@
 highlight CmdOutput  font: normal 14px 'Menlo' !important;
 highlight CompItem   font: normal 14px 'Menlo' !important;
 
-set passkeys+=duckduckgo.com:jk<cr>
-"set defsearch=duckduckgo-ssl
+highlight Find   background: #d6c149; color: #000;
+
 set runtimepath=/Users/sjl/.pentadactyl
 set editor='/usr/local/bin/mvim -f +<line> <file>'
 set followhints=1
@@ -21,6 +21,9 @@
 nnoremap j 3j
 nnoremap k 3k
 
+nnoremap gI 2gi
+nnoremap gO gn
+
 " Switch tabs with J and K
 nnoremap J :tn<CR>
 nnoremap K :tp<CR>
@@ -29,8 +32,8 @@
 " nnoremap <c-f> <f12>
 " nnoremap <c-g> <s-f12>
 
-nnoremap <c-g> <m-a-k>
-inoremap <c-g> <esc><m-a-k>
+nnoremap <c-g> <m-a-k><esc>
+inoremap <c-g> <esc><m-a-k><esc>
 
 nnoremap <c-f> <m-a-i>
 inoremap <c-f> <esc><m-a-i>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/addcontact	Mon Feb 13 09:10:28 2012 -0500
@@ -0,0 +1,50 @@
+#!/bin/bash
+osascript -e "tell application \"Address Book\"" \
+-e "  set firstParam to \"$1\"" \
+-e "  set secondParam to \"$2\"" \
+-e "  set thirdParam to \"$3\"" \
+-e "  set fourthParam to \"$4\"" \
+-e "  set contactEmailLabel to \"\"" \
+-e "  set spaceOffset to (offset of \" \" in firstParam)" \
+-e "  if (spaceOffset is not equal to 0) then" \
+-e "    set AppleScript's text item delimiters to \" \"" \
+-e "    set firstName to (text item 1 of firstParam)" \
+-e "    set lastName to (text item 2 of firstParam)" \
+-e "    set firstEmailParam to secondParam" \
+-e "    set secondEmailParam to thirdParam" \
+-e "  else" \
+-e "    set firstName to firstParam" \
+-e "    set lastName to secondParam" \
+-e "    set firstEmailParam to thirdParam" \
+-e "    set secondEmailParam to fourthParam" \
+-e "  end if" \
+-e "  set atOffset to (offset of \"@\" in firstEmailParam)" \
+-e "  if (atOffset is not equal to 0) then" \
+-e "    set contactEmail to firstEmailParam" \
+-e "  else" \
+-e "    set contactEmailLabel to firstEmailParam" \
+-e "    set contactEmail to secondEmailParam" \
+-e "  end if" \
+-e "  if (contactEmailLabel is equal to \"\") then" \
+-e "    set contactEmailLabel to \"Home\"" \
+-e "  end if" \
+-e "  set newPerson to (make new person with properties {first name:firstName, last name:lastName})" \
+-e "  make new email at end of emails of newPerson with properties {label:contactEmailLabel, value:contactEmail}" \
+-e "  save" \
+-e "  if (newPerson exists) then" \
+-e "    if (firstName exists) then" \
+-e "      set returnString to (\"First name: \" & firstName)" \
+-e "    end if" \
+-e "    if (lastName exists) then" \
+-e "      set returnString to (returnString & \"; Last name: \" & lastName)" \
+-e "    end if" \
+-e "    if (contactEmailLabel exists) then" \
+-e "      set returnString to (returnString & \"; Email label: \" & contactEmailLabel)" \
+-e "    end if" \
+-e "    if (contactEmail exists) then" \
+-e "      set returnString to (returnString & \"; Email address: \" & contactEmail)" \
+-e "    end if" \
+-e "    return returnString" \
+-e "  end if" \
+-e "end tell"
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/dev.universalsubtitles.org.js	Mon Feb 13 09:10:28 2012 -0500
@@ -0,0 +1,4 @@
+$('#menu_name > a').attr('href', '#');
+$('div#menu_name > a').click(function() {
+    $('div#menu').toggle();
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/staging.universalsubtitles.org	Mon Feb 13 09:10:28 2012 -0500
@@ -0,0 +1,1 @@
+dev.universalsubtitles.org.js
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/unisubs.example.com.js	Mon Feb 13 09:10:28 2012 -0500
@@ -0,0 +1,1 @@
+dev.universalsubtitles.org.js
\ No newline at end of file

--- a/keymando/keymandorc.rb	Sat Feb 04 14:26:38 2012 -0500
+++ b/keymando/keymandorc.rb	Mon Feb 13 09:10:28 2012 -0500
@@ -9,6 +9,8 @@
 
 # Application Switching ------------------------------------------------------------
 map "<Ctrl-Shift-J>", lambda { activate('Firefox') }
+map "<Ctrl-Shift-P>", lambda { activate('Pixelmator') }
+map "<Ctrl-Shift-B>", lambda { activate('Pixen') }
 map "<Ctrl-Shift-K>", lambda { activate('MacVim') }
 map "<Ctrl-Shift-H>", lambda { activate('iTerm') }
 map "<Ctrl-Shift-O>", lambda { activate('Rdio') }

--- a/keyremap4macbook/private.xml	Sat Feb 04 14:26:38 2012 -0500
+++ b/keyremap4macbook/private.xml	Mon Feb 13 09:10:28 2012 -0500
@@ -1,67 +1,67 @@
 <?xml version="1.0"?>
 <root>
-  <list>
-      <item>
-          <name>Tab to Option_R</name>
-          <appendix>(+ When you type Tab only, send Tab)</appendix>
-          <identifier>private.tab_to_option</identifier>
-          <autogen>--KeyOverlaidModifier-- KeyCode::TAB, KeyCode::OPTION_R, KeyCode::TAB</autogen>
-      </item>
-  </list>
-  <list>
-    <item>
-      <name>Swap parens and brackets</name>
-      <identifier>private.swap_parens_and_brackets</identifier>
-      <autogen>--KeyToKey-- KeyCode::BRACKET_LEFT,  ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
-      <autogen>--KeyToKey-- KeyCode::BRACKET_RIGHT, ModifierFlag::NONE, KeyCode::KEY_0, ModifierFlag::SHIFT_R</autogen>
-      <autogen>--KeyToKey-- KeyCode::KEY_9,         ModifierFlag::SHIFT_L, KeyCode::BRACKET_LEFT</autogen>
-      <autogen>--KeyToKey-- KeyCode::KEY_0,         ModifierFlag::SHIFT_L, KeyCode::BRACKET_RIGHT</autogen>
-    </item>
-  </list>
+    <list>
+        <item>
+            <name>Swap parens and brackets</name>
+            <identifier>private.swap_parens_and_brackets</identifier>
+            <autogen>--KeyToKey-- KeyCode::BRACKET_LEFT,  ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R</autogen>
+            <autogen>--KeyToKey-- KeyCode::BRACKET_RIGHT, ModifierFlag::NONE, KeyCode::KEY_0, ModifierFlag::SHIFT_R</autogen>
+            <autogen>--KeyToKey-- KeyCode::KEY_9,         ModifierFlag::SHIFT_L, KeyCode::BRACKET_LEFT</autogen>
+            <autogen>--KeyToKey-- KeyCode::KEY_0,         ModifierFlag::SHIFT_L, KeyCode::BRACKET_RIGHT</autogen>
+        </item>
+    </list>
 
-  <list>
-      <item>
-          <name>Command_R to Option+Backspace</name>
-          <identifier>private.cmd_r_kill_word</identifier>
-          <autogen>--KeyToKey-- KeyCode::COMMAND_R, KeyCode::DELETE, ModifierFlag::OPTION_L</autogen>
-      </item>
-  </list>
-  <list>
-    <item>
-      <name>Use the correct goddamed shift keys.</name>
-      <identifier>private.fucking_shift_keys_how_do_they_work</identifier>
+    <list>
+        <item>
+            <name>Shift_R to Shift_R</name>
+            <appendix>(+ When you type shift_R only without other modifiers, send cmd+right)</appendix>
+            <identifier>private.shiftL2shiftR</identifier>
+            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::CURSOR_RIGHT, ModifierFlag::COMMAND_L</autogen>
+        </item>
+        <item>
+            <name>Shift_L to Shift_L</name>
+            <appendix>(+ When you type shift_L only without other modifiers, send opt+left)</appendix>
+            <identifier>private.shiftL2shiftL</identifier>
+            <autogen>--KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::CURSOR_LEFT, ModifierFlag::OPTION_L</autogen>
+        </item>
+    </list>
+
+    <list>
+        <item>
+            <name>Use the correct goddamed shift keys.</name>
+            <identifier>private.fucking_shift_keys_how_do_they_work</identifier>
 
-      <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE</autogen>
 
-      <autogen>--KeyToKey-- KeyCode::Y,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::U,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::I,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::O,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::P,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::H,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::J,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::K,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::L,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::N,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::M,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::COMMA,     ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::DOT,       ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-      <autogen>--KeyToKey-- KeyCode::QUOTE,     ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
-    </item>
-  </list>
+            <autogen>--KeyToKey-- KeyCode::Y,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::U,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::I,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::O,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::P,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::H,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::J,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::K,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::L,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::N,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::M,         ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::COMMA,     ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::DOT,       ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+            <autogen>--KeyToKey-- KeyCode::QUOTE,     ModifierFlag::SHIFT_R, KeyCode::VK_NONE</autogen>
+        </item>
+    </list>
 </root>
 

--- a/vim/.vimrc	Sat Feb 04 14:26:38 2012 -0500
+++ b/vim/.vimrc	Mon Feb 13 09:10:28 2012 -0500
@@ -31,7 +31,6 @@
 set history=1000
 set undofile
 set undoreload=10000
-set cpoptions+=J
 set list
 set listchars=tab:▸\ ,eol:¬,extends:❯,precedes:❮
 set shell=/bin/bash
@@ -40,7 +39,7 @@
 set showbreak=↪
 set splitbelow
 set splitright
-set fillchars=diff:⣿
+set fillchars=diff:⣿,vert:│
 set ttimeout
 set notimeout
 set nottimeout
@@ -60,6 +59,15 @@
 " Resize splits when the window is resized
 au VimResized * :wincmd =
 
+" cpoptions+=J, dammit {{{
+
+" Something occasionally removes this.  If I manage to find it I'm going to
+" comment out the line and replace all its characters with 'FUCK'.
+augroup twospace
+    au BufRead * :set cpoptions+=J
+augroup END
+
+" }}}
 " Trailing whitespace {{{
 " Only shown when not in insert mode so I don't go insane.
 
@@ -139,7 +147,6 @@
 
 syntax on
 set background=dark
-" colorscheme molokai
 colorscheme badwolf
 
 " Highlight VCS conflict markers
@@ -513,6 +520,9 @@
     " Use <localleader>f to fold the current tag.
     au FileType html,jinja,htmldjango nnoremap <buffer> <localleader>f Vatzf
 
+    " Use <localleader>t to fold the current templatetag.
+    au FileType html,jinja,htmldjango nmap <buffer> <localleader>t viikojozf
+
     " Use Shift-Return to turn this:
     "     <tag>|</tag>
     "
@@ -1005,6 +1015,8 @@
 nnoremap <F5> :GundoToggle<CR>
 let g:gundo_debug = 1
 let g:gundo_preview_bottom = 1
+let g:gundo_tree_statusline = "Gundo"
+let g:gundo_preview_statusline = "Gundo Preview"
 
 " }}}
 " Haskellmode {{{
@@ -1417,7 +1429,6 @@
     highlight SpellBad term=underline gui=undercurl guisp=Orange
 
     " Use a line-drawing char for pretty vertical splits.
-    set fillchars+=vert:│
 
     " Different cursors for different modes.
     set guicursor=n-c:block-Cursor-blinkon0

--- a/vim/ftplugin/clojure/clojurefolding.vim	Sat Feb 04 14:26:38 2012 -0500
+++ b/vim/ftplugin/clojure/clojurefolding.vim	Mon Feb 13 09:10:28 2012 -0500
@@ -17,6 +17,9 @@
             \ 'defpartial',
             \ 'deftest',
             \ 'defroutes',
+            \ 'defentity',
+            \ 'defdb',
+            \ 'defproject',
             \ 'ns'
             \ ]
 let s:form_re      = '\v^\((' . join(folded_forms, '|') . ')\s'

--- a/weechat/weechat.conf	Sat Feb 04 14:26:38 2012 -0500
+++ b/weechat/weechat.conf	Mon Feb 13 09:10:28 2012 -0500
@@ -208,7 +208,7 @@
 nicklist.conditions = "nicklist"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = on
+nicklist.hidden = off
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200

--- a/zsh/misc.zsh	Sat Feb 04 14:26:38 2012 -0500
+++ b/zsh/misc.zsh	Mon Feb 13 09:10:28 2012 -0500
@@ -85,7 +85,7 @@
 alias goawayswapfilesyouareswapfilesidontevenneedyou='rm ~/.vim/tmp/swap/*'
 
 function fack () {
-    find . $@ | grep -v '/\.hg\|/\.git'
+    find . -name $@ | grep -v '/\.hg\|/\.git'
 }
 
 alias collapse="sed -e 's/  */ /g'"