# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1278826546 14400
# Node ID 6bd31aa2672a62d000a2a7c500d423868733e434
# Parent  beeff917055ea0bdc541e3cfde9950b711220fd1
vim: yep, sure haven't committed in a while'

diff -r beeff917055e -r 6bd31aa2672a .hgrc
--- a/.hgrc	Tue Jun 29 13:45:02 2010 -0400
+++ b/.hgrc	Sun Jul 11 01:35:46 2010 -0400
@@ -50,9 +50,9 @@
 from = Steve Losh <steve@stevelosh.com>
 
 [smtp]
-host = smtp.stevelosh.com
+host = smtp.gmail.com
 port = 587
-username = sjl
+username = steve@stevelosh.com
 tls = True
 
 [color]
diff -r beeff917055e -r 6bd31aa2672a .zshrc
--- a/.zshrc	Tue Jun 29 13:45:02 2010 -0400
+++ b/.zshrc	Sun Jul 11 01:35:46 2010 -0400
@@ -31,7 +31,9 @@
 
 # Mercurial variables --------------------------------------------------------
 export PATH="$HOME/lib/hg/hg-stable:$PATH"
-export PYTHONPATH="$HOME/lib/hg/hg-stable:/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
+export PYTHONPATH="$HOME/lib/hg/hg-stable:$PYTHONPATH"
+export PYTHONPATH="/usr/local/lib/python2.6/site-packages:$PYTHONPATH"
+export PYTHONPATH="$PYTHONPATH:/usr/local/lib/python2.7/site-packages"
 
 # Extra shell extensions like z and tab completion for Mercurial -------------
 source ~/lib/z/z.sh
diff -r beeff917055e -r 6bd31aa2672a vim/.gvimrc
--- a/vim/.gvimrc	Tue Jun 29 13:45:02 2010 -0400
+++ b/vim/.gvimrc	Sun Jul 11 01:35:46 2010 -0400
@@ -1,7 +1,12 @@
 set guifont=Menlo:h12
 colorscheme molokai
+set background=dark
 
 set go-=T
+set go-=l
+set go-=L
+set go-=r
+set go-=R
 
 if has("gui_macvim")
     macmenu &File.New\ Tab key=<nop>
@@ -11,7 +16,4 @@
 let g:sparkupExecuteMapping = '<D-e>'
 
 highlight SpellBad term=underline gui=undercurl guisp=Orange
-highlight LongLine guibg=#343738
 
-" Long lines suck.
-match LongLine '\%>84v.\+'
diff -r beeff917055e -r 6bd31aa2672a vim/.vimrc
--- a/vim/.vimrc	Tue Jun 29 13:45:02 2010 -0400
+++ b/vim/.vimrc	Sun Jul 11 01:35:46 2010 -0400
@@ -10,6 +10,7 @@
 set expandtab
 
 " Basic options
+set encoding=utf-8
 set scrolloff=3
 set autoindent
 set smartindent
@@ -35,19 +36,24 @@
 let mapleader = ","
 
 " FuzzyFinder
-map <Leader>t :FuzzyFinderTextMate<Enter>
-map <Leader>b :FuzzyFinderBuffer<Enter>
-let g:fuzzy_ignore = "*.pyc;log/**;.svn/**;.git/**;.hg/**;pip-log.txt;*.gif;*.jpg;*.jpeg;*.png;**media/admin/**;**media/ckeditor/**;**media/filebrowser/**;**media/pages/**;**src/**;**build/**;**_build/**;**media/cache/**"
-let g:fuzzy_matching_limit = 70
+if !has("gui_macvim")
+    map <Leader>t :FuzzyFinderTextMate<Enter>
+    map <Leader>b :FuzzyFinderBuffer<Enter>
+    let g:fuzzy_ignore = "*.pyc;log/**;.svn/**;.git/**;.hg/**;pip-log.txt;*.gif;*.jpg;*.jpeg;*.png;**media/admin/**;**media/ckeditor/**;**media/filebrowser/**;**media/pages/**;**src/**;**build/**;**_build/**;**media/cache/**"
+    let g:fuzzy_matching_limit = 70
+end
 
 " Searching
+nnoremap / /\v
+vnoremap / /\v
 set ignorecase
 set smartcase
 set incsearch
 set showmatch
 set hlsearch
 set gdefault
-map <leader><space> :let @/=''<CR>
+map <leader><space> :let @/=''<cr>
+runtime macros/matchit.vim
 
 " Soft/hard wrapping
 set wrap
@@ -67,7 +73,7 @@
 call pathogen#runtime_append_all_bundles()
 
 " NERD Tree
-map <F2> :NERDTreeToggle<CR>
+map <F2> :NERDTreeToggle<cr>
 let NERDTreeIgnore=['.vim$', '\~$', '.*\.pyc$', 'pip-log\.txt$']
 
 " Use the damn hjkl keys
@@ -114,16 +120,16 @@
 au BufNewFile,BufRead *.markdown set filetype=markdown
 
 " Sort CSS
-map <leader>S ?{<CR>jV/^\s*\}\=$<CR>k:sort<CR>:let @/=''<CR>
+map <leader>S ?{<cr>jV/^\s*\}\=$<CR>k:sort<CR>:let @/=''<CR>
 
 " Clean whitespace
-map <leader>W :%s/\s\+$//<CR>:let @/=''<CR>
+map <leader>W :%s/\s\+$//<cr>:let @/=''<CR>
 
 " Exuberant ctags!
 let Tlist_Ctags_Cmd = "/usr/local/bin/ctags"
 let Tlist_WinWidth = 50
 map <F4> :TlistToggle<cr>
-map <F5> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --exclude='@.ctagsignore' .<CR>
+map <F5> :!/usr/local/bin/ctags -R --c++-kinds=+p --fields=+iaS --extra=+q --exclude='@.ctagsignore' .<cr>
 
 " Ropevim
 let $PYTHONPATH .= ":" . $HOME . "/lib/python/rope"
@@ -134,15 +140,35 @@
 map <leader>a :Ack 
 
 " Yankring
-nnoremap <silent> <F3> :YRShow<CR>
+nnoremap <silent> <F3> :YRShow<cr>
 nnoremap <silent> <leader>y :YRShow<cr>
 
 " Formatting, TextMate-style
 map <leader>q gqip
 
+" TESTING GOAT APPROVES OF THESE LINES
+au BufNewFile,BufRead test_*.py set makeprg=nosetests\ --machine-out\ --nocapture
+au BufNewFile,BufRead test_*.py set shellpipe=2>&1\ >/dev/null\ \|\ tee
+au BufNewFile,BufRead test_*.py set errorformat=%f:%l:\ %m
+au BufNewFile,BufRead test_*.py nmap <silent> <Leader>n <Plug>MakeGreen
+au BufNewFile,BufRead test_*.py nmap <Leader>N :make<cr>
+nmap <silent> <leader>ff :QFix<cr>
+nmap <leader>fn :cn<cr>
+nmap <leader>fp :cp<cr>
+
+command -bang -nargs=? QFix call QFixToggle(<bang>0)
+function! QFixToggle(forced)
+  if exists("g:qfix_win") && a:forced == 0
+    cclose
+    unlet g:qfix_win
+  else
+    copen 10
+    let g:qfix_win = bufnr("$")
+  endif
+endfunction
+
+
 " TODO: Put this in filetype-specific files
-map <leader>n :!nosetests<CR>
-map <leader>N :!nosetests "%:p"<CR>
 au BufNewFile,BufRead *.less set foldmethod=marker
 au BufNewFile,BufRead *.less set foldmarker={,}
 au BufNewFile,BufRead *.less set nocursorline
@@ -152,11 +178,11 @@
 map <leader>v V`]
 
 " HTML tag closing
-imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<CR>a
+imap <C-_> <Space><BS><Esc>:call InsertCloseTag()<cr>a
 
 " Conque
-nmap <leader>sh :ConqueTermVSplit zsh<CR>
-nmap <leader>SH :ConqueTermSplit zsh<CR>
+nmap <leader>sh :ConqueTermVSplit zsh<cr>
+nmap <leader>SH :ConqueTermSplit zsh<cr>
 nmap <leader>r :ConqueTermVSplit 
 nmap <leader>R :ConqueTermSplit 
 
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/.mduem/cache/Makefile.variables
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/.mduem/cache/Makefile.variables	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,6 @@
+all_files_in_repos :=          Makefile after/syntax/vim/arpeggio.vim autoload/arpeggio.vim doc/arpeggio.txt plugin/arpeggio.vim test/ui.expected test/ui.input
+current_branch := master
+origin_name := origin
+origin_uri := ../.
+repos_name := vim-arpeggio
+version := 0.0.6
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/Makefile	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,13 @@
+# Makefile for usual Vim plugin
+
+REPOS_TYPE := vim-script
+INSTALLATION_DIR := $(HOME)/.vim
+TARGETS_STATIC = $(filter %.vim %.txt,$(all_files_in_repos))
+TARGETS_ARCHIVED = $(all_files_in_repos) mduem/Makefile
+
+
+
+
+include mduem/Makefile
+
+# __END__
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/after/syntax/vim/arpeggio.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/after/syntax/vim/arpeggio.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,43 @@
+" Vim additional syntax: vim/arpeggio - highlight :Arpeggio commands
+" Version: 0.0.6
+" Copyright (C) 2008-2010 kana <http://whileimautomaton.net/>
+" License: So-called MIT/X license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+
+syntax keyword vimArpeggioCommand
+\      Arpeggio
+\      skipwhite nextgroup=vimMap
+
+syntax match vimArpeggioCommand
+\      /\<Arpeggio[cilnosvx]\(\|nore\|un\)map\>/
+\      skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+
+syntax match vimArpeggioCommand
+\      /\<Arpeggio\%(\|nore\|un\)map\>!\?/
+\      skipwhite nextgroup=vimMapMod,vimMapLhs
+
+
+
+
+highlight default link vimArpeggioCommand  vimCommand
+
+" __END__
+" vim: foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/autoload/arpeggio.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/autoload/arpeggio.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,439 @@
+" arpeggio - Mappings for simultaneously pressed keys
+" Version: 0.0.6
+" Copyright (C) 2008-2010 kana <http://whileimautomaton.net/>
+" License: So-called MIT/X license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+" Notes  "{{{1
+"
+" CONVENTIONS FOR INTERNAL MAPPINGS
+"
+" <SID>work:...
+"               Use to set 'timeoutlen', to restore 'timeoutlen', and to
+"               determine whether keys are simultaneously pressed or not.
+"
+" <SID>success:...
+"               Use to restore 'timeoutlen' and to do user-defined action for
+"               the simultaneously pressed keys "...".
+"
+"
+" MAPPING FLOWCHART
+"
+"                        {X}            (user types a key {X})
+"                         |
+"                         v
+"                  <SID>work:{X}
+"                         |  (are {Y}... simultaneously typed with {X}?)
+"                  [yes]  |  [no]
+"         .---------------*-------------------.
+"         |                                   |
+"         v                                   v
+"  <SID>work:{X}{Y}...          <Plug>(arpeggio-default:{X})
+"         |
+"         v
+" <SID>success:{X}{Y}...
+"         |
+"         v
+"       {rhs}
+
+
+
+
+
+
+
+
+" Variables  "{{{1
+
+" See s:set_up_options() and s:restore_options().
+let s:original_showcmd = &showcmd
+let s:original_timeout = &timeout
+let s:original_timeoutlen = &timeoutlen
+let s:original_ttimeoutlen = &ttimeoutlen
+
+
+
+
+
+
+
+
+" Public  "{{{1
+function! arpeggio#list(modes, options, ...)  "{{{2
+  let lhs = 1 <= a:0 ? a:1 : 0
+  let opt_buffer = a:options =~# 'b' ? '<buffer>' : ''
+
+  for mode in s:each_char(a:modes)
+    execute printf('%smap %s <SID>success:%s',
+    \              mode, opt_buffer, lhs is 0 ? '' : lhs)
+  endfor
+  return
+endfunction
+
+
+
+
+function! arpeggio#load()  "{{{2
+  runtime! plugin/arpeggio.vim
+endfunction
+
+
+
+
+function! arpeggio#map(modes, options, remap_p, lhs, rhs)  "{{{2
+  for mode in s:each_char(a:modes)
+    call s:do_map(mode, a:options, a:remap_p, s:split_to_keys(a:lhs), a:rhs)
+  endfor
+  return
+endfunction
+
+
+
+
+function! arpeggio#unmap(modes, options, lhs)  "{{{2
+  let v:errmsg = ''
+
+  for mode in s:each_char(a:modes)
+    call s:do_unmap(mode, a:options, s:split_to_keys(a:lhs))
+  endfor
+
+  if v:errmsg != ''
+    echoerr v:errmsg
+  endif
+  return v:errmsg == ''
+endfunction
+
+
+
+
+
+
+
+
+" Core  "{{{1
+function! arpeggio#_do(script)  "{{{2
+  let _ = split(substitute(a:script, '^\s\+', '', ''), '^\S\+\zs')
+  execute 'Arpeggio'._[0] join(_[1:], '')
+  return
+endfunction
+
+
+
+
+function! arpeggio#_map_or_list(modes, remap_p, q_args)  "{{{2
+  let [options, lhs, rhs] = s:parse_args(a:q_args)
+  if rhs isnot 0
+    return arpeggio#map(a:modes, options, a:remap_p, lhs, rhs)
+  else
+    return arpeggio#list(a:modes, options, lhs)
+  endif
+endfunction
+
+
+
+
+function! arpeggio#_unmap(modes, q_args)  "{{{2
+  let [options, lhs, rhs] = s:parse_args(a:q_args)
+  return arpeggio#unmap(a:modes, options, lhs)
+endfunction
+
+
+
+
+function! s:chord_cancel(key)  "{{{2
+  call s:restore_options()
+  return "\<Plug>(arpeggio-default:" . a:key . ')'
+endfunction
+
+
+
+
+function! s:chord_key(key)  "{{{2
+  call s:set_up_options(a:key)
+  return s:SID . 'work:' . a:key  " <SID>work:...
+endfunction
+
+
+
+
+function! s:chord_success(keys)  "{{{2
+  call s:restore_options()
+  return s:SID . 'success:' . a:keys  " <SID>success:...
+endfunction
+
+
+
+
+function! s:do_map(mode, options, remap_p, keys, rhs)  "{{{2
+  " Assumption: Values in a:keys are <>-escaped, e.g., "<Tab>" not "\<Tab>".
+  let opt_buffer = a:options =~# 'b' ? '<buffer>' : ''
+
+  let already_mapped_p = 0
+  for key in a:keys
+    let rhs = maparg(key, a:mode)
+    if rhs != '' && rhs !=# ('<SNR>' . matchstr(s:SID, '\d\+') . '_'
+    \                        . 'chord_key(' . string(key) . ')')
+      echohl WarningMsg
+      echomsg 'Key' string(key) 'is already mapped in mode' string(a:mode)
+      echohl None
+      let already_mapped_p = !0
+    endif
+  endfor
+  if a:options =~# 'u' && already_mapped_p
+    echoerr 'Abort to map because of the above reason'
+    return
+  endif
+
+  for key in a:keys
+    execute printf('%smap <expr> %s %s  <SID>chord_key(%s)',
+    \              a:mode, opt_buffer, key, string(s:unescape_lhs(key)))
+  endfor
+
+  let combos = []
+  for i in range(1, len(a:keys) - 1)
+    call extend(combos, s:permutations(a:keys, i))
+  endfor
+  for combo in combos
+    execute printf('%smap <expr> <SID>work:%s  <SID>chord_cancel(%s)',
+    \              a:mode, combo, string(s:unescape_lhs(combo)))
+    execute printf('silent! %snoremap <unique> <Plug>(arpeggio-default:%s) %s',
+    \              a:mode, combo, combo)
+  endfor
+
+  for combo in s:permutations(a:keys, len(a:keys))
+    execute printf('%smap <expr> <SID>work:%s  <SID>chord_success(%s)',
+    \              a:mode, combo, string(s:unescape_lhs(combo)))
+    execute printf('%s%smap %s <SID>success:%s  %s',
+    \              a:mode,
+    \              a:remap_p ? '' : 'nore',
+    \              s:to_map_arguments(a:options),
+    \              combo,
+    \              a:rhs)
+  endfor
+  return
+endfunction
+
+
+
+
+function! s:do_unmap(mode, options, keys)  "{{{2
+  " FIXME: Mediate key mappings "<SID>work:" should be removed.
+  "        But they may be used by other arpeggio key mappings and it's hard
+  "        to determine whether a given mediate key mappng is still used or
+  "        not in fast and exact way.  So that they aren't removed currently.
+  let opt_buffer = a:options =~# 'b' ? '<buffer>' : ''
+
+  for key in a:keys
+    silent! execute printf('%sunmap %s %s',
+    \                      a:mode, opt_buffer, key)
+  endfor
+
+  for combo in s:permutations(a:keys, len(a:keys))
+    silent! execute printf('%sunmap %s <SID>success:%s',
+    \                      a:mode,
+    \                      s:to_map_arguments(a:options),
+    \                      combo)
+  endfor
+
+  return
+endfunction
+
+
+
+
+
+
+
+
+" Misc.  "{{{1
+function! s:SID()  "{{{2
+  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_')
+endfunction
+let s:SID = "\<SNR>" . s:SID() . '_'
+
+
+
+
+function! s:each_char(s)  "{{{2
+  return split(a:s, '.\zs')
+endfunction
+
+
+
+
+function! s:parse_args(q_args)  "{{{2
+  " Parse <q-args> for :map commands into {options}, {lhs} and {rhs}.
+  " Omitted arguments are expressed as 0.
+  let ss = s:split_to_keys(a:q_args)
+
+  let options = ''
+  let ss = s:skip_spaces(ss)
+  while 0 < len(ss)
+    if ss[0] =~? '<buffer>'
+      let options .= 'b'
+    elseif ss[0] =~? '<expr>'
+      let options .= 'e'
+    elseif ss[0] =~? '<silent>'
+      let options .= 's'
+    elseif ss[0] =~? '<unique>'
+      let options .= 'u'
+    else
+      break
+    endif
+    let ss = s:skip_spaces(ss[1:])
+  endwhile
+
+  let i = 0
+  while i < len(ss)
+    if ss[i] =~ '\s'
+      break
+    endif
+    let i += 1
+  endwhile
+  let lhs = 1 <= i ? join(ss[:i-1], '') : 0
+  let ss = s:skip_spaces(ss[(i):])
+
+  let rhs = 0 < len(ss) ? join(ss, '') : 0
+
+  return [options, lhs, rhs]
+endfunction
+
+
+
+
+function! s:permutations(ss, r)  "{{{2
+  " This function is translated one of itertools.permutations() of Python 2.6:
+  " http://www.python.org/doc/2.6/library/itertools.html#itertools.permutations
+  let result = []
+  let n = len(a:ss)
+  let r = a:r
+  let indices = range(n)
+  let cycles = range(n, n-r+1, -1)
+  let rest = n
+  for _ in range(n-1, n-r+1, -1)
+    let rest = rest * _
+  endfor
+
+  call add(result, join(map(indices[:r-1], 'a:ss[v:val]'), ''))
+  for _ in range(rest - 1)
+    for i in range(r-1, 0, -1)
+      let cycles[i] -= 1
+      if cycles[i] == 0
+        let indices[(i):] = indices[(i+1):] + indices[(i):(i)]
+        let cycles[i] = n - i
+      else
+        let j = cycles[i]
+        let [indices[i], indices[-j]] = [indices[-j], indices[i]]
+        call add(result, join(map(indices[:r-1], 'a:ss[v:val]'), ''))
+        break
+      endif
+    endfor
+  endfor
+  return result
+endfunction
+
+
+
+
+function! s:restore_options()  "{{{2
+  let &showcmd = s:original_showcmd
+  let &timeout = s:original_timeout
+  let &timeoutlen = s:original_timeoutlen
+  let &ttimeoutlen = s:original_ttimeoutlen
+  return
+endfunction
+
+
+
+
+function! s:set_up_options(key)  "{{{2
+  let s:original_showcmd = &showcmd
+  let s:original_timeout = &timeout
+  let s:original_timeoutlen = &timeoutlen
+  let s:original_ttimeoutlen = &ttimeoutlen
+
+  set noshowcmd  " To avoid flickering in the bottom line.
+  set timeout  " To ensure time out on :mappings
+  let &timeoutlen = get(g:arpeggio_timeoutlens, a:key, g:arpeggio_timeoutlen)
+  let &ttimeoutlen = (0 <= s:original_ttimeoutlen
+  \                   ? s:original_ttimeoutlen
+  \                   : s:original_timeoutlen)
+  return
+endfunction
+
+
+
+
+function! s:skip_spaces(ss)  "{{{2
+  let i = 0
+  for i in range(len(a:ss))
+    if a:ss[i] !~# '\s'
+      break
+    endif
+  endfor
+  return a:ss[(i):]
+endfunction
+
+
+
+
+function! s:split_to_keys(lhs)  "{{{2
+  " Assumption: Special keys such as <C-u> are escaped with < and >, i.e.,
+  "             a:lhs doesn't directly contain any escape sequences.
+  return split(a:lhs, '\(<[^<>]\+>\|.\)\zs')
+endfunction
+
+
+
+
+function! s:to_map_arguments(options)  "{{{2
+  let _ = {'b': '<buffer>', 'e': '<expr>', 's': '<silent>', 'u': '<unique>'}
+  return join(map(s:each_char(a:options), '_[v:val]'))
+endfunction
+
+
+
+
+function! s:unescape_lhs(escaped_lhs)  "{{{2
+  let keys = s:split_to_keys(a:escaped_lhs)
+  call map(keys, 'v:val =~ "^<.*>$" ? eval(''"\'' . v:val . ''"'') : v:val')
+  return join(keys, '')
+endfunction
+
+
+
+
+function! s:without(list, i)  "{{{2
+  if 0 < a:i
+    return a:list[0 : (a:i-1)] + a:list[(a:i+1) : -1]
+  else
+    return a:list[1:]
+  endif
+endfunction
+
+
+
+
+
+
+
+
+" __END__  "{{{1
+" vim: foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/doc/arpeggio.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/doc/arpeggio.txt	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,332 @@
+*arpeggio.txt*	Key mappings for simultaneously pressed keys
+
+Version 0.0.6
+Script ID: 2425
+Copyright (C) 2008-2010 kana <http://whileimautomaton.net/>
+License: So-called MIT/X license  {{{
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    "Software"), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+}}}
+
+CONTENTS					*arpeggio-contents*
+
+Introduction		|arpeggio-introduction|
+Interface		|arpeggio-interface|
+  Commands		  |arpeggio-commands|
+  Functions		  |arpeggio-functions|
+  Mappings		  |arpeggio-mappings|
+  Variables		  |arpeggio-variables|
+Bugs			|arpeggio-bugs|
+Changelog		|arpeggio-changelog|
+
+
+
+
+==============================================================================
+INTRODUCTION					*arpeggio-introduction*
+
+*arpeggio* is a Vim plugin to define another type of |key-mapping| called
+*arpeggio-key-mapping* -- it consists of 2 or more keys ({lhs}) and it will be
+expanded to another key sequence ({rhs}) whenever all keys in {lhs} are
+simultaneously pressed.  For example:
+>
+	Arpeggio inoremap jk  <Esc>
+	" OR
+	call arpeggio#map('i', '', 0, 'jk', '<Esc>')
+<
+With the above definition, you can input <Esc> in Insert mode by pressing "j"
+and "k" simultaneously, while you can move the cursor by pressing "j" or "k"
+solely.
+
+The concept of this plugin is derived from Emacs' key-chord.el (*1), but there
+are the following differences:
+
+- Number of keys to be simultaneously pressed is unlimited.
+
+- Custom delay for each key is supported (see |g:arpeggio_timeoutlens|).
+  This is a generalization of space-chord.el (*2).
+
+(*1) http://www.emacswiki.org/emacs/key-chord.el
+(*2) http://www.emacswiki.org/emacs/space-chord.el
+
+
+Requirements:
+- Vim 7.2 or later
+
+Latest version:
+http://github.com/kana/vim-arpeggio
+
+Document in HTML format:
+http://kana.github.com/config/vim/arpeggio.html
+
+
+
+
+==============================================================================
+INTERFACE					*arpeggio-interface*
+
+------------------------------------------------------------------------------
+COMMANDS					*arpeggio-commands*
+
+:Arpeggio {command} ...				*:Arpeggio*
+			Equivalent to ":Arpeggio{command} ...".  This command
+			is just for readability.
+
+:Arpeggiomap {lhs} {rhs}			*:Arpeggiomap*
+:Arpeggiomap! {lhs} {rhs}			*:Arpeggiomap!*
+:Arpeggiocmap {lhs} {rhs}			*:Arpeggiocmap*
+:Arpeggioimap {lhs} {rhs}			*:Arpeggioimap*
+:Arpeggiolmap {lhs} {rhs}			*:Arpeggiolmap*
+:Arpeggionmap {lhs} {rhs}			*:Arpeggionmap*
+:Arpeggioomap {lhs} {rhs}			*:Arpeggioomap*
+:Arpeggiosmap {lhs} {rhs}			*:Arpeggiosmap*
+:Arpeggiovmap {lhs} {rhs}			*:Arpeggiovmap*
+:Arpeggioxmap {lhs} {rhs}			*:Arpeggioxmap*
+			Like |:map| and others, but map to {rhs} if and only
+			if all keys in {lhs} are simultaneously pressed.
+
+			Available |:map-arguments| are <buffer>, <expr>,
+			<silent> and/or <unique>.  See also |arpeggio#map()|
+			for other notes and limitations.
+
+:Arpeggionoremap {lhs} {rhs}			*:Arpeggionoremap*
+:Arpeggionoremap! {lhs} {rhs}			*:Arpeggionoremap!*
+:Arpeggiocnoremap {lhs} {rhs}			*:Arpeggiocnoremap*
+:Arpeggioinoremap {lhs} {rhs}			*:Arpeggioinoremap*
+:Arpeggiolnoremap {lhs} {rhs}			*:Arpeggiolnoremap*
+:Arpeggionnoremap {lhs} {rhs}			*:Arpeggionnoremap*
+:Arpeggioonoremap {lhs} {rhs}			*:Arpeggioonoremap*
+:Arpeggiosnoremap {lhs} {rhs}			*:Arpeggiosnoremap*
+:Arpeggiovnoremap {lhs} {rhs}			*:Arpeggiovnoremap*
+:Arpeggioxnoremap {lhs} {rhs}			*:Arpeggioxnoremap*
+			Variants of |:Arpeggiomap| without remapping, like
+			|:noremap|.
+
+:Arpeggiounmap {lhs} {rhs}			*:Arpeggiounmap*
+:Arpeggiounmap! {lhs} {rhs}			*:Arpeggiounmap!*
+:Arpeggiocunmap {lhs} {rhs}			*:Arpeggiocunmap*
+:Arpeggioiunmap {lhs} {rhs}			*:Arpeggioiunmap*
+:Arpeggiolunmap {lhs} {rhs}			*:Arpeggiolunmap*
+:Arpeggionunmap {lhs} {rhs}			*:Arpeggionunmap*
+:Arpeggioounmap {lhs} {rhs}			*:Arpeggioounmap*
+:Arpeggiosunmap {lhs} {rhs}			*:Arpeggiosunmap*
+:Arpeggiovunmap {lhs} {rhs}			*:Arpeggiovunmap*
+:Arpeggioxunmap {lhs} {rhs}			*:Arpeggioxunmap*
+			Like |:unmap| and others, but remove key mappings
+			defined by |:Arpeggiomap| and/or others.
+
+:Arpeggiomap [{lhs}]				*:Arpeggiomap_l*
+:Arpeggiomap! [{lhs}]				*:Arpeggiomap_l!*
+:Arpeggiocmap [{lhs}]				*:Arpeggiocmap_l*
+:Arpeggioimap [{lhs}]				*:Arpeggioimap_l*
+:Arpeggiolmap [{lhs}]				*:Arpeggiolmap_l*
+:Arpeggionmap [{lhs}]				*:Arpeggionmap_l*
+:Arpeggioomap [{lhs}]				*:Arpeggioomap_l*
+:Arpeggiosmap [{lhs}]				*:Arpeggiosmap_l*
+:Arpeggiovmap [{lhs}]				*:Arpeggiovmap_l*
+:Arpeggioxmap [{lhs}]				*:Arpeggioxmap_l*
+			List key mappings which are defined by |:Arpeggiomap|
+			or others and which contain all keys in {lhs}.
+			If {lhs} is omitted, list all key mappings defined by
+			|:Arpeggiomap| or others.
+
+
+------------------------------------------------------------------------------
+FUNCTIONS					*arpeggio-functions*
+
+arpeggio#list({modes}, {options}, [{lhs}])	*arpeggio#list()*
+			Function version of |:Arpeggiomap_l| and others.
+			See |arpeggio#map()| for the details of arguments.
+
+			For this function, {lhs} can be omitted or can be 0.
+			If so, all arpeggio mappings defined in {modes} will
+			be listed.
+
+arpeggio#load()					*arpeggio#load()*
+			Load this plugin if it is not loaded yet.  Otherwise,
+			does nothing.  Call this function to ensure that
+			|arpeggio-commands| are defined before you use one of
+			them, especially, in your |vimrc|.
+
+						*arpeggio#map()*
+arpeggio#map({modes}, {options}, {remap-p}, {lhs}, {rhs})
+			Function version of |:Arpeggiomap| and others.
+
+			{modes}
+				String.  Each character means one or more
+				modes to define the given key mapping.  "n"
+				means Normal mode, "v" means Visual mode and
+				Select mode (the same as what |:vmap| does),
+				and so forth.
+
+			{options}
+				String.  Each character means one of
+				|:map-arguments|.  The meanings of characters
+				are as follows:
+
+				Char	Meaning ~
+				b	<buffer>
+				e	<expr>
+				s	<silent>
+				u	<unique>
+
+				Other |:map-arguments| are not supported for
+				arpeggio key mappings.
+
+				Note that the meaning of <unique> is a bit
+				differed as follows:
+
+				- If a key in {lhs} is already mapped to
+				  something other than a part of
+				  |arpeggio-key-mapping|, an error will be
+				  raised and defining of this mapping will be
+				  aborted.
+
+				- If {lhs} is already mapped to another
+				  |arpeggio-key-mapping|, an error will be
+				  raised and defining of this mapping will be
+				  aborted.
+
+			{remap-p}
+				Number as a boolean.  True means that {rhs}
+				will be remapped, and false means that {rhs}
+				will not be remapped.
+
+			{lhs}
+				String.  This value must contain two or more
+				keys.  Special keys such as <C-u> must be
+				escaped with < and >, i.e., use '<C-u>' not
+				"\<C-u>".
+
+			{rhs}
+				String.
+
+arpeggio#unmap({modes}, {options}, {lhs})	*arpeggio#unmap()*
+			Function version of |:Arpeggiounmap| and others.
+			See |arpeggio#map()| for the details of arguments.
+
+
+------------------------------------------------------------------------------
+MAPPINGS					*arpeggio-mappings*
+
+In the following description, {X} means a character in {lhs} which are used
+for |:Arpeggiomap| and others.
+
+{X}
+			Mapped to internal stuffs.  Don't map {X} to anything.
+			To customize the action for solely typed {X}, use
+			|<Plug>(arpeggio-default:{X})| instead.
+
+<Plug>(arpeggio-default:{X})			*<Plug>(arpeggio-default:{X})*
+			Pseudo key sequence to customize the action whenever
+			{X} is typed solely.  By default, this key sequence is
+			mapped to {X} with no remapping.
+
+
+------------------------------------------------------------------------------
+VARIABLES					*arpeggio-variables*
+
+g:arpeggio_timeoutlen	number  (default 40)	*g:arpeggio_timeoutlen*
+			The time in milliseconds to determine whether typed
+			keys are simultaneously pressed or not.
+
+g:arpeggio_timeoutlens	Dictionary (default {})	*g:arpeggio_timeoutlens*
+			Each key (in this dictionary) is a string of a key (on
+			a keyboard), and each value is a number which means
+			the same as |g:arpeggio_timeoutlen| but it is used
+			only for the corresponding key.
+
+
+
+
+==============================================================================
+BUGS						*arpeggio-bugs*
+
+- Not all keyboards have N-key rollover (*).  Though this plugin supports
+  unlimited number of simultaneously pressed keys, 3 or more keys may not be
+  inputted simultaneously.
+
+  For keyboards which don't have N-key rollover, it's possible to emulate to
+  simultaneously press 3 or more keys by pressing each key after another key
+  in short time, i.e., arpeggio.
+
+  (*) http://en.wikipedia.org/wiki/Rollover_(key)
+
+- |arpeggio-key-mapping| may not be worked or may be conflicted with |@|
+  and/or |key-mapping|.  Because recorded key sequence doesn't have any
+  information about typing delay for each key.  So some keys may be treated as
+  an arpeggio key mapping unexpectedly.
+
+
+
+
+==============================================================================
+CHANGELOG					*arpeggio-changelog*
+
+0.0.6	2010-04-20T12:24:42+09:00		*arpeggio-changelog-0.0.6*
+	- Fix |arpeggio-commands| to behave the same as |:map| commands.  In
+	  other words, " and keys after " in {rhs} for |arpeggio-commands| are
+	  treated as a part of {rhs}.  Old versions don't behave so.
+	- Fix minor bugs.
+	- Revise the document a bit.
+	- Revise additional syntax highlighting a bit.
+
+0.0.5	2008-11-19T23:11:31+09:00		*arpeggio-changelog-0.0.5*
+	- Remove the assumption on 'timeout' and 'ttimeout'.  Old version
+	  assumes that "set timeout notimeout", but now their values can be
+	  arbitrary.
+	- Fix the bug that 'ttimeoutlen' can be interpreted as an unexpected
+	  value because of the adjustment of 'timeout' and 'timeoutlen' for
+	  arpeggio key mappings.
+
+0.0.4	2008-11-10T02:38:07+09:00		*arpeggio-changelog-0.0.4*
+	- Add syntax highlighting for |arpeggio-commands|.
+	- Fix bugs of "noremap" version of |arpeggio-commands| such as
+	  |:Arpeggionoremap| that {rhs} are remapped despite the meaning of
+	  the commands.  (Thanks for id:ampmmn)
+
+0.0.3	2008-11-09T10:37:46+09:00		*arpeggio-changelog-0.0.3*
+	- Add |:Arpeggio|.
+	- Support |:map-<unique>| for |arpeggio#map()| and other commands.
+	- In |arpeggio#map()| and other commands, warn if a key in {lhs} is
+	  already mapped to something other than a part of another
+	  |arpeggio-key-mapping|.
+	- Add custom 'timeoutlen' per key.  See |g:arpeggio_timeoutlens|.
+	- Add a bit of completion for |arpeggio-commands|.
+
+0.0.2	2008-11-07T22:16:51+09:00		*arpeggio-changelog-0.0.2*
+	- Fix |:Arpeggionoremap| that allowed remapping but it should not do
+	  so.  (Thanks for id:ampmmn)
+	- Define |arpeggio-commands| and |arpeggio-variables| automatically
+	  for interactive or other use.  (But you still have to call
+	  |arpeggio#load()| to use them in vimrc.)
+
+0.0.1	2008-11-06T09:34:19+09:00		*arpeggio-changelog-0.0.1*
+	- Implement |arpeggio-commands|.
+	- Add missing |arpeggio#list()|.
+	- Revise minor stuffs.
+
+0.0.0	2008-11-04T15:53:03+09:00		*arpeggio-changelog-0.0.0*
+	- Initial version.
+
+
+
+
+==============================================================================
+vim:tw=78:ts=8:ft=help:norl:fen:fdl=0:fdm=marker:
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/mduem/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/mduem/Makefile	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,431 @@
+# mduem - Little utility for little software development
+#
+# This is a library Makefile to maintain software development, especially for
+# Vim script.  Note that this Makefile requires GNU make to use.
+# Coding Rules  #{{{1
+#
+# - Use non-empty string as true and empty string as false.
+#
+#
+# Naming Rules:
+#
+# - Use UPPER_CASE variables to be configured by user.
+#
+# - Use lower_case variables for internal use of mduem.
+#
+# - Use suffix "_p" to indicate that a boolean value is resulted from
+#   a variable.
+#   Example: SHOULD_INSTALL_ASIS_P
+#
+# - Use noun for ordinary variables.
+#   Example: repos_name, TARGETS_GENERATED
+#
+# - Use verb for variables as functions.
+#   Example: resolve_dep_uri, RENAME_TARGET
+#
+# - Use prefix "generate_rule_" for variables to generate make rules.
+#   Example: generate_rule_to_install_a_target
+#
+# - Use abbreviations for words which names are too long to code.
+#   Example: dependency => dep, directory => dir, repository => repos
+#
+# - Use lower-case names for phony targets.
+#
+# - Use verb for phony targets.
+#   Example: clean, install, pack, ...
+#
+# - Use hyphens to join words in names of phony targets.
+#   Example: clean-junks, fetch-deps
+#
+# - Use prefix "," for names of files which are automatically generated by
+#   mduem and they are temporary ones.
+#   Example: test/,good-case.output
+#
+# - Use directory ".mduem" to contain stuffs for internal use.
+#   Example: .mduem/cache/
+#
+# - All rules may be violated if there is a strong custom from old times.
+#   Example: all (phony target)
+
+
+
+
+
+
+
+
+# Common  #{{{1
+
+all: # Ensure that this is the default target.
+
+SHELL := /bin/bash
+this_makefile := $(lastword $(MAKEFILE_LIST))
+cache_makefile := .mduem/cache/Makefile.variables
+user_makefiles := $(filter-out \
+                    $(this_makefile) $(cache_makefile), \
+                    $(MAKEFILE_LIST))
+
+not = $(if $(1),,t)
+toplevel_dir := $(shell git rev-parse --show-toplevel 2>/dev/null)
+inner_dir := $(shell git rev-parse --show-prefix 2>/dev/null)
+git_controlled_p := $(toplevel_dir)
+toplevel_dir_p := $(and $(git_controlled_p),$(call not,$(inner_dir)))
+
+ifneq '$(git_controlled_p)' ''
+$(cache_makefile): \
+		$(toplevel_dir)/.git/config \
+		$(toplevel_dir)/.git/index \
+		$(this_makefile)
+	@echo 'GENERATE $@'
+	@mkdir -p '$(dir $@)'
+	@{ \
+	   current_branch="$$(git symbolic-ref -q HEAD \
+	                      | sed -e 's|^refs/heads/||')"; \
+	   _origin_name="$$(git config "branch.$$current_branch.remote")"; \
+	   origin_name="$${_origin_name:-origin}"; \
+	   _origin_uri="$$(git config "remote.$$origin_name.url")"; \
+	   origin_uri="$${_origin_uri:-../.}"; \
+	   \
+	   echo "all_files_in_repos := \
+	         $(filter-out .gitmodules \
+	                      $(shell cd $(toplevel_dir) && \
+	                              git submodule foreach 'echo "$$path"'),\
+	           $(shell git ls-files))"; \
+	   echo "current_branch := $${current_branch}"; \
+	   echo "origin_name := $${origin_name}"; \
+	   echo "origin_uri := $${origin_uri}"; \
+	   echo 'repos_name := $(notdir $(shell pwd))'; \
+	   echo 'version := $(shell git describe --tags --always --dirty)'; \
+	 } >'$@'
+endif
+include $(cache_makefile)
+
+	# The type of a repository.  It must be one of the following values:
+	#
+	# generic       For any software.
+	# vim-script    For Vim plugins, etc.
+REPOS_TYPE ?= $(if $(filter vim-%,$(repos_name)),vim-script,generic)
+vim_script_repos_p := $(filter vim-script,$(REPOS_TYPE))
+
+
+
+
+
+
+
+
+# all  #{{{1
+
+.PHONY: all
+all: build
+
+
+
+
+
+
+
+
+# build  #{{{1
+
+TARGETS_ARCHIVED ?= $(all_files_in_repos)
+TARGETS_GENERATED ?=# Empty
+TARGETS_STATIC ?=# Empty
+
+targets_all_installed := $(TARGETS_GENERATED) $(TARGETS_STATIC)
+targets_all_archived := $(sort \
+                          $(TARGETS_ARCHIVED) \
+                          $(targets_all_installed) \
+                          $(cache_makefile) \
+                          )
+
+
+
+
+.PHONY: build
+build: $(targets_all_installed)
+
+
+
+
+
+
+
+
+# clean  #{{{1
+
+.PHONY: clean
+clean: clean-generated clean-junks
+
+.PHONY: clean-generated
+clean-generated:
+	@echo 'CLEAN-GENERATED'
+	@rm -rf $(TARGETS_GENERATED)
+	@find -name '.mduem' | xargs rm -rf
+
+.PHONY: clean-junks
+clean-junks:
+	@echo 'CLEAN-JUNKS'
+	@find -name '*~' -or -name ',*' | xargs rm -rf
+
+
+
+
+
+
+
+
+# fetch-deps  #{{{1
+
+DEPS ?=# Empty
+vim_script_deps := $(if $(vim_script_repos_p),vim-vspec vimup,)
+all_deps := $(vim_script_deps) $(DEPS)
+
+DEP_vim_vspec_URI ?= ../vim-vspec
+DEP_vim_vspec_VERSION ?= 0.0.3
+
+DEP_vimup_URI ?= ../vimup
+DEP_vimup_VERSION ?= 0.0.0a3
+
+
+	# BUGS: This resolves "../" just once, but it's enough for usual cases.
+resolve_dep_uri = $(strip $(if $(filter ../%,$(1)), \
+                            $(dir $(origin_uri))$(1:../%=%), \
+                            $(1)))
+normalize_dep_name = $(subst -,_,$(1))
+get_dep_raw_uri = $(DEP_$(call normalize_dep_name,$(1))_URI)
+get_dep_dir_name = $(patsubst %.git,%,$(notdir $(call get_dep_uri,$(1))))
+
+get_dep_uri = $(call resolve_dep_uri,$(call get_dep_raw_uri,$(1)))
+get_dep_version = $(DEP_$(call normalize_dep_name,$(1))_VERSION)
+get_dep_dir = .mduem/deps/$(call get_dep_dir_name,$(1))
+
+
+
+
+.PHONY: fetch-deps
+fetch-deps: $(all_deps:%=.mduem/deps/,%)
+
+# FIXME: Update for changes on only DEPS and other values.
+.mduem/deps/,%: $(user_makefiles)
+	@echo 'FETCH-DEP $*'
+	@mkdir -p '$(dir $@)'
+	@   ( \
+	         if [ -d '$(call get_dep_dir,$*)' ] \
+	      ;  then \
+	           cd './$(call get_dep_dir,$*)' \
+	      &&   git fetch \
+	      &&   git checkout -f mduem-master \
+	      ;  else \
+	           git clone '$(call get_dep_uri,$*)' '$(call get_dep_dir,$*)'\
+	      &&   cd './$(call get_dep_dir,$*)' \
+	      &&   git checkout -b mduem-master \
+	      ;  fi \
+	      && git reset --hard '$(call get_dep_version,$*)' \
+	 ;  ) &>'$@.log' \
+	 || { cat '$@.log'; false; }
+	@touch '$@'
+
+
+
+
+
+
+
+
+# install  #{{{1
+# Core  #{{{2
+
+INSTALLATION_DIR ?= $(error Please set INSTALLATION_DIR)
+
+RENAME_TARGET ?= $(patsubst %,$(INSTALLATION_DIR)/%,$(1))
+SHOULD_INSTALL_ASIS_P ?=# All files are version-filtered by default.
+
+
+
+
+.PHONY: install
+install: build
+
+
+define generate_rule_to_install_a_target  # (build_target, install_target)
+install: $(2)
+$(2): $(1)
+	@echo 'INSTALL $(1)'
+	@mkdir -p '$(dir $(2))'
+ifneq '$(call SHOULD_INSTALL_ASIS_P,$(1))' ''
+	@cp '$(1)' '$(2)'
+else
+	@sed -e 's/0.0.6/$(version)/' '$(1)' >'$(2)'
+endif
+
+endef
+$(eval \
+  $(foreach t, \
+    $(targets_all_installed), \
+    $(call generate_rule_to_install_a_target,$(t),$(call RENAME_TARGET,$(t)))))
+
+
+# This should be placed at the last to ensure that post-install is executed
+# after any other rules to install.
+install: post-install
+
+
+
+
+# post-install  #{{{2
+
+TARGETS_POST_INSTALL ?=# Empty
+targets_post_install_builtin :=# Empty
+
+
+ifneq '$(vim_script_repos_p)' ''
+target_vim_helptags := $(call RENAME_TARGET,doc/tags)
+$(target_vim_helptags): $(filter doc/%.txt,$(targets_all_installed))
+	@echo 'POST-INSTALL vim helptags'
+	@vim -n -N -u NONE -U NONE -e -c 'helptags $(dir $@) | qall!'
+
+targets_post_install_builtin += $(target_vim_helptags)
+endif
+
+
+.PHONY: post-install
+post-install: $(targets_post_install_builtin) $(TARGETS_POST_INSTALL)
+
+
+
+
+
+
+
+
+# pack  #{{{1
+
+archive_basename = $(repos_name)-$(version)
+archive_name = $(archive_basename).zip
+
+
+.PHONY: pack
+pack: $(archive_name)
+
+$(archive_name): $(cache_makefile)
+	rm -rf '$(archive_basename)' '$(archive_name)'
+	$(MAKE) \
+	  'INSTALLATION_DIR=$(archive_basename)' \
+	  'targets_all_installed=$(targets_all_archived)' \
+	  install
+	zip -r $(archive_name) $(archive_basename)/
+	rm -rf '$(archive_basename)'
+
+
+
+
+
+
+
+
+# release  #{{{1
+
+.PHONY: release
+release: $(if $(vim_script_repos_p),release-vim-script,release-default)
+
+
+.PHONY: release-default
+release-default:
+	@echo 'Rules to release are not defined.'
+
+
+.PHONY: release-vim-script
+release-vim-script: fetch-deps $(repos_name).vimup pack
+	./.mduem/deps/vimup/vimup update-script $(repos_name)
+	rm $(repos_name).vimup
+
+.PHONY: release-new-vim-script
+release-new-vim-script: fetch-deps $(repos_name).vimup pack
+	./.mduem/deps/vimup/vimup new-script $(repos_name)
+	rm $(repos_name).vimup
+
+$(repos_name).vimup: $(firstword $(sort $(filter doc/%.txt, \
+                                                 $(all_files_in_repos))))
+	./.mduem/deps/vimup/vimup-info-generator \
+	  <$< \
+	  >$(repos_name).vimup
+
+
+
+
+
+
+
+
+# test  #{{{1
+
+test_cases := $(patsubst test/%.expected,%, \
+                $(filter test/%.expected,$(all_files_in_repos)))
+
+
+default_test_rule_deps := $(MAKEFILE_LIST)
+define default_test_rule
+	source './$<' &>'$@' || { cat '$@'; false; }
+endef
+
+ifneq '$(vim_script_repos_p)' ''
+all_vim_scripts := $(filter %.vim,$(all_files_in_repos))
+vim_script_test_rule_deps := .mduem/deps/vim-vspec/bin/vspec $(all_vim_scripts)
+define vim_script_test_rule
+	./$(call get_dep_dir,vim-vspec)/bin/vspec \
+	  $< \
+	  "$$PWD" \
+	  $(foreach d,$(all_deps),$(call get_dep_dir,$(d))) \
+	  &>$@
+endef
+endif
+
+TEST_RULE ?= $(if $(vim_script_repos_p), \
+               $(vim_script_test_rule), \
+               $(default_test_rule))
+TEST_RULE_DEPS ?=# Empty
+
+builtin_test_rule_deps := $(if $(vim_script_repos_p), \
+                            $(vim_script_test_rule_deps), \
+                            $(default_test_rule_deps))
+all_test_rule_deps := $(builtin_test_rule_deps) $(TEST_RULE_DEPS)
+
+
+
+
+.PHONY: test
+test: fetch-deps test/,ok
+
+test/,ok: $(test_cases:%=test/,%.ok)
+	@echo 'ALL TESTS ARE PASSED.'
+	@touch $@
+
+test/,%.ok: test/%.input $(all_test_rule_deps)
+	@echo -n 'TEST $* ... '
+	@$(MAKE) --silent '$(@:.ok=.diff)'
+	@if ! [ -s $(@:.ok=.diff) ]; then \
+	   echo 'OK'; \
+	 else \
+	   echo 'FAILED'; \
+	   cat $(@:.ok=.diff); \
+	   echo 'END'; \
+	   false; \
+	 fi
+	@touch $@
+
+test/,%.diff: test/%.expected test/,%.output
+	@diff -u $^ >$@; true
+
+test/,%.output: test/%.input $(all_test_rule_deps)
+	@$(TEST_RULE)
+
+
+
+
+
+
+
+
+# __END__  #{{{1
+# vim: foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/plugin/arpeggio.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/plugin/arpeggio.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,96 @@
+" arpeggio - Mappings for simultaneously pressed keys
+" Version: 0.0.6
+" Copyright (C) 2008-2010 kana <http://whileimautomaton.net/>
+" License: So-called MIT/X license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+
+if exists('g:loaded_arpeggio')
+  finish
+endif
+
+
+
+
+if !exists('g:arpeggio_timeoutlen')
+  let g:arpeggio_timeoutlen = 40
+endif
+if !exists('g:arpeggio_timeoutlens')
+  let g:arpeggio_timeoutlens = {}
+endif
+
+
+
+
+command! -complete=command -nargs=+ Arpeggio  call arpeggio#_do(<q-args>)
+
+
+function! s:_(...)
+  execute call('printf',
+  \            ['command! %s -complete=mapping -nargs=* Arpeggio%s'
+  \             . '  call arpeggio#_map_or_list(%s, %s, <q-args>)']
+  \            + a:000)
+endfunction
+
+call s:_('-bang', 'map', "(<bang>0 ? 'ic' : 'nvo')", 1)
+call s:_('', 'cmap', '"c"', 1)
+call s:_('', 'imap', '"i"', 1)
+call s:_('', 'lmap', '"l"', 1)
+call s:_('', 'nmap', '"n"', 1)
+call s:_('', 'omap', '"o"', 1)
+call s:_('', 'smap', '"s"', 1)
+call s:_('', 'vmap', '"v"', 1)
+call s:_('', 'xmap', '"x"', 1)
+
+call s:_('-bang', 'noremap', "(<bang>0 ? 'ic' : 'nvo')", 0)
+call s:_('', 'cnoremap', '"c"', 0)
+call s:_('', 'inoremap', '"i"', 0)
+call s:_('', 'lnoremap', '"l"', 0)
+call s:_('', 'nnoremap', '"n"', 0)
+call s:_('', 'onoremap', '"o"', 0)
+call s:_('', 'snoremap', '"s"', 0)
+call s:_('', 'vnoremap', '"v"', 0)
+call s:_('', 'xnoremap', '"x"', 0)
+
+
+function! s:_(...)
+  execute call('printf',
+  \            ['command! %s -complete=mapping -nargs=* Arpeggio%s'
+  \             . '  call arpeggio#_unmap(%s, <q-args>)']
+  \            + a:000)
+endfunction
+
+call s:_('-bang', 'unmap', "(<bang>0 ? 'ic' : 'nvo')")
+call s:_('', 'cunmap', '"c"')
+call s:_('', 'iunmap', '"i"')
+call s:_('', 'lunmap', '"l"')
+call s:_('', 'nunmap', '"n"')
+call s:_('', 'ounmap', '"o"')
+call s:_('', 'sunmap', '"s"')
+call s:_('', 'vunmap', '"v"')
+call s:_('', 'xunmap', '"x"')
+
+
+
+
+let g:loaded_arpeggio = 1
+
+" __END__
+" vim: foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/test/ui.expected
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/test/ui.expected	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,10 @@
+==== Arpeggio 
+---- It should define key mappings properly. 
+...........
+
+
+
+**** Result ****
+
+
+11 examples, 0 failures
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/arpeggio/test/ui.input
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/arpeggio/test/ui.input	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,46 @@
+runtime! plugin/arpeggio.vim
+
+function! CheckMapModes(lhs)
+  let _ = ['n', 'x', 's', 'o', 'i', 'c', 'l']
+  call map(_, 'maparg(' . string(a:lhs) . ', v:val)')
+  call map(_, 'v:val != ""')
+  return _
+endfunction
+
+function s:describe__Arpeggio()  "{{{1
+  " Set up.
+
+  tabnew
+
+  It should define key mappings properly.
+
+  silent! execute 'Arpeggio inoremap lhs1  rhs1"rhs2'
+  silent! execute 'Arpeggio inoremap lhs2  rhs1<Bar>rhs2'
+  silent! execute 'Arpeggio inoremap lhs3  rhs1|rhs2'
+  Should CheckMapModes('o') ==# [0, 0, 0, 0, 0, 0, 0]
+  Should CheckMapModes('l') ==# [0, 0, 0, 0, 1, 0, 0]
+  Should CheckMapModes('h') ==# [0, 0, 0, 0, 1, 0, 0]
+  Should CheckMapModes('s') ==# [0, 0, 0, 0, 1, 0, 0]
+  Should CheckMapModes('1') ==# [0, 0, 0, 0, 1, 0, 0]
+  Should CheckMapModes('2') ==# [0, 0, 0, 0, 1, 0, 0]
+  Should CheckMapModes('3') ==# [0, 0, 0, 0, 1, 0, 0]
+
+  normal olhs0
+  Should getline('.') ==# 'lhs0'
+  normal olhs1
+  Should getline('.') ==# 'rhs1"rhs2'
+  normal olhs2
+  Should getline('.') ==# 'rhs1|rhs2'
+  normal olhs3
+  Should getline('.') ==# 'rhs1'
+
+  " Tear down.
+
+  tabclose!
+endfunction
+
+
+
+
+" __END__  "{{{1
+" vim: filetype=vim foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/makegreen/README.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/makegreen/README.md	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,72 @@
+vim-MakeGreen
+=============
+
+makegreen.vim is a vim (http://www.vim.org) plugin that runs make and shows the
+test run status with a red or green bar.
+
+Installation
+------------
+
+Copy all files to your ~/.vim directory or use Tim Pope's excellent pathogen plugin (http://github.com/tpope/vim-pathogen).
+
+Usage
+-----
+
+&lt;Leader&gt;t will run make for the current file and show its status with a red or green message bar.
+
+example:
+
+    $ cd <your rails/merb root>
+    $ vim test/unit/user_test.rb
+
+    :compiler rubyunit
+    press <Leader>t
+
+(&lt;Leader&gt; is mapped to '\' by default)
+
+
+Default Key Bindings
+--------------------
+
+&lt;Leader&gt;t: run make and show red/green bar
+
+You can change default key bindings:
+
+    map <Leader>] <Plug>MakeGreen " change from <Leader>t to <Leader>]
+
+Configuring Vim's Makeprg
+-------------------------
+
+MakeGreen expects your make program to accept the current file name as its
+argument. Specifically, if `:make %` works, MakeGreen will work.
+
+Using Compilers
+---------------
+
+The easiest way to use MakeGreen is with compilers. For instance, vim's ruby
+configuration files provide an rspec compiler that sets makeprg and errorformat
+appropriately for running specs and parsing their output.
+
+You can tell vim to use the rspec compiler for all *_spec.rb files by adding
+this line to your vimrc:
+
+      autocmd BufNewFile,BufRead *_spec.rb compiler rspec
+
+Then `:make %` (make current file) and MakeGreen will work automatically when
+you are in a spec.
+
+Credits
+-------
+
+- Based on code from the rubytest.vim plugin
+  (http://github.com/reinh/vim-rubytest) but considerably refactored and
+  modified for this more specific purpose.
+
+- Red/Green bar code borrowed from Gary Bernhardt
+  (http://bitbucket.org/garybernhardt/dotfiles/src/tip/.vimrc) and slightly
+  modified for my use. Please do check out Gary's coding videos on his blog
+  for more awesome vim usage (http://blog.extracheese.org/).
+
+- elik and godlygeek in #vim on irc.freenode.net for vim help
+
+- Jim Remsik (@jremsikjr on twitter) for debugging and typo fixing.
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/makegreen/plugin/makegreen.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/makegreen/plugin/makegreen.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,80 @@
+" plugin/makegreen.vim
+" Author:   Rein Henrichs <reinh@reinh.com>
+" License:  MIT License
+
+" Install this file as plugin/makegreen.vim.
+
+" ============================================================================
+
+" Exit quickly when:
+" - this plugin was already loaded (or disabled)
+" - when 'compatible' is set
+if &cp || exists("g:makegreen_loaded") && g:makegreen_loaded
+  finish
+endif
+let g:makegreen_loaded = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function s:RunMake() "{{{1
+  silent! w
+  let s:old_sp = &shellpipe
+  "set shellpipe=> "quieter make output
+  silent! make %
+  let &shellpipe = s:old_sp
+
+  redraw!
+
+  let error = s:GetFirstError()
+  if error != ''
+    call s:Bar("red", error)
+  else
+    call s:Bar("green","All tests passed")
+  endif
+endfunction
+"}}}1
+" Utility Functions" {{{1
+function s:GetFirstError()
+  if getqflist() == []
+    return ''
+  endif
+
+  for error in getqflist()
+    if error['valid']
+      break
+    endif
+  endfor
+  let error_message = substitute(error['text'], '^ *', '', 'g')
+  let error_message = substitute(error_message, "\n", ' ', 'g')
+  let error_message = substitute(error_message, "  *", ' ', 'g')
+  return error_message
+endfunction
+
+function s:Bar(type, msg)
+  hi GreenBar term=reverse ctermfg=black ctermbg=green guifg=white guibg=green
+  hi RedBar   term=reverse ctermfg=white ctermbg=red guifg=white guibg=red
+  if a:type == "red"
+    echohl RedBar
+  else
+    echohl GreenBar
+  endif
+  echon a:msg repeat(" ", &columns - strlen(a:msg))
+  echohl None
+endfunction
+
+" }}}1
+" Mappings" {{{1
+
+noremap <unique> <script> <Plug>MakeGreen <SID>Make
+noremap <SID>Make :call <SID>RunMake()<CR>
+
+if !hasmapto('<Plug>MakeGreen')
+  map <unique> <silent> <Leader>t <Plug>MakeGreen
+endif
+" }}}1
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set sw=2 sts=2:
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/peepopen/README.md
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/peepopen/README.md	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,33 @@
+vim-peepopen
+=============
+
+A plugin for the Vim text editor. PeepOpen provides fuzzy search of filenames and paths in a programming project.
+
+Installation
+------------
+
+Get the PeepOpen.app and open it at least once to approve the Mac OS X security dialog.
+
+Standard:
+
+Copy `peepopen.vim` to your `~/.vim/plugin` directory.
+
+With Tim Pope's [Pathogen](http://github.com/tpope/vim-pathogen):
+
+Copy the entire `vim-peepopen` plugin directory to your `~/.vim/bundle` directory.
+
+Usage
+-----
+
+`<Leader>p` opens the current project directory with the PeepOpen application.
+
+Use the [vim-rooter](http://github.com/airblade/vim-rooter) plugin for automatic assignment of the current working directory for projects stored in Git.
+
+(Leader is mapped to '\' by default)
+
+Credits
+-------
+
+- Initial Vim Plugin by [Andrew Stewart](http://www.airbladesoftware.com/).
+- Some plugin boilerplate from [Rein Henrichs](http://reinh.com/).
+
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/peepopen/plugin/peepopen.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/bundle/peepopen/plugin/peepopen.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,44 @@
+" plugin/peepopen.vim
+" Author:   Geoffrey Grosenbach <boss@topfunky.com>
+" License:  MIT License
+
+" Install this file as plugin/peepopen.vim.
+
+" If you prefer Command-T, use this snippet in your .gvimrc:
+
+" if has("gui_macvim")
+"   macmenu &File.New\ Tab key=<nop>
+"   map <D-t> <Plug>PeepOpen
+" end
+
+" ============================================================================
+
+" Exit quickly when:
+" - this plugin was already loaded (or disabled)
+" - when 'compatible' is set
+if &cp || exists("g:peepopen_loaded") && g:peepopen_loaded
+  finish
+endif
+let g:peepopen_loaded = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function s:LaunchPeepOpenViaVim()
+  let cwd = getcwd()
+  silent exe "!open -a PeepOpen " . shellescape(cwd)
+endfunction
+
+command! PeepOpen :call <SID>LaunchPeepOpenViaVim()
+
+noremap <unique> <script> <Plug>PeepOpen <SID>Launch
+noremap <SID>Launch :call <SID>LaunchPeepOpenViaVim()<CR>
+
+if !hasmapto('<Plug>PeepOpen')
+  map <unique> <silent> <Leader>p <Plug>PeepOpen
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set sw=2 sts=2:
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/space/doc/space.txt
--- a/vim/bundle/space/doc/space.txt	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,215 +0,0 @@
-*space.txt*   Smart Space Key
-
-                                                                 *space.vim*
-
-     ______  ______   _____   _____  _____
-    / _____\ | ___ \ / ___ \ / ___/ / ___/
-    \ \____  | ___ / | \ / | | |    | \__ 
-     \___  \ | |     | |X| | | |___ | /___
-    /______/ \_|     \_/ \_/ \____/ \____/
-
-      By Henrik Öhman <speeph@gmail.com>
-
-
-                               Reference Manual ~
-
-
-                                                                 *space-toc*
-
-1. Intro                                               |space-intro|
-2. Usage                                               |space-usage|
-3. Hooks                                               |space-hooks|
-4. Status line integration                             |space-statusline|
-5. Configuration                                       |space-configuration|
-6. License                                             |space-license|
-
-
-
-==============================================================================
-1. Intro                                                       *space-intro*
-
-space.vim is a plugin which remaps the *<Space>* key to act as a clever key
-to repeat motions. To disable space.vim, set the "space_loaded" global
-variable in your |vimrc| file: >
-    :let g:space_loaded = 1
-
-space.vim hooks into several of the more complex motion commands, such as
-|search-commands|, |jumpto-diffs|, |quickfix| and |location-list| and more
-commands. When a command that space.vim has hooked into is issued, it remaps
-the <Space> key to repeat that command, and it also remaps <S-Space> and
-<BS> to do the reverse.
-
-NOTE:~Due to terminal restrictions, <S-Space> may not be available. For that
-reason, the <BS> key is also used for reverse motions. Wherever this document
-talks of <S-Space>, <BS> can be used in its place.
-
-NOTE:~space.vim has some problems with the |'foldopen'| option. Since Vim
-won't open folds if a command is part of a mapping, space.vim tries to
-emulate this behaviour. This works well for all Normal mode mappings and for
-most Visual mode mappings. Only for searches using |/| and |?| in Visual mode
-is space.vim unable to emulate |'foldopen'|.
-
-NOTE:~Some |filetype| plugins map the section text objects ([[, [], ][, ]])
-and the method motions ([m, [M, ]m, ]M). space.vim is unable to hook into
-these mappings in a well defined way. There is definitely room for
-improvement here.
-
-==============================================================================
-2. Usage                                                       *space-usage*
-
-Using space.vim is intuitive. Issue a command, such as a search, and the
-<Space> key to go to the next match, and <S-Space> to go to the previous
-match. Thus, the following sequence >
-    /foo<CR>
-    n
-    N
-
-is equivalent to >
-    /foo<CR>
-    <Space>
-    <S-Space>
-
-This works with counts, and with Visual mode too >
-    /foo<CR>
-    V
-    4<Space>
-
-space.vim tries to immitate Vim in its logic when specifying the direction for
-the repeated movement. For the search commands, <Space> behaves like |n|, and
-<S-Space> behaves like |N|, which means that a <Space> following a search using
-|?|, will actually find the previous match. For other commands, <Space> is
-configured to use the variant of the command that has the meaning of "next".
-Thus, <Space> is always mapped to |:lnext|, |[[|, |zj| etc, and never the
-reverse.
-
-The full power of space.vim will become apparent if you use |jumpto-diffs|,
-in particular on non-US keyboards, or |quickfix| and |location-list|
-commands. Remember all that finger stretching and keyboard dancing to quickly
-browse through a series of diffs for a fast overview of what your colleague
-managed to screw up this time? No more! >
-    ]c            Jump to the next diff
-    <Space>       Repeat the ]c motion
-    ...           Nothing interesting, keep pressing space
-    <S-Space>     Wait, there was something! Let's go back one diff
-
-Or why not quickly browse through all files which contain the sentence 'over
-9000' in all subdirectories? >
-    :lvimgrep /over 9000/ **/*      Find all the matches and add them to the
-                                    location-list
-    <Space>                         <Space> is now mapped to :lnext
-    <S-Space>                       And <S-Space> is mapped to :lprevious
-
-Neat, huh? To get an overview of all the commands space.vim hooks into, and
-enables <Space> and <S-Space> mappings for, read on. |space-hooks|
-
-==============================================================================
-3. Hooks                                                       *space-hooks*
-
-This is a list of all the commands that space.vim hooks into and provides
-<Space> and <S-Space> navigation for.
-
-Character movements:                                    |left-right-motions|
-    |f||F||t||T||;||,|
-
-Search commands:                                           |search-commands|
-    |star||gstar||#||g#||n||N|
-
-Diff jumps:                                                   |jumpto-diffs|
-    |]c||[c|
-
-Parenthesis and bracket jumps:                             |various-motions|
-    |])||[(||]}||[{|
-
-Method jumps:                                              |various-motions|
-    |]m||[m||]M||[M|
-
-Section jumps:                                              |object-motions|
-    |]]||[]||][||[[|
-
-Fold movements:
-    |zj||zk||]z||[z|
-
-Quickfix commands:                                                |quickfix|
-   |:make|
-   |:vimgrep|
-   |:grep|
-   |:cc|
-   |:cnext|
-   |:cprevious|
-   |:cNext|
-   |:cfirst|
-   |:clast|
-   |:crewind|
-   |:cfile|
-   |:cnfile|
-   |:cpfile|
-   |:cNfile|
-  
-Location list commands:                                      |location-list|
-   |:lmake|
-   |:lvimgrep|
-   |:lgrep|
-   |:ll|
-   |:lcnext|
-   |:lcprevious|
-   |:lcNext|
-   |:lcfirst|
-   |:lclast|
-   |:lcrewind|
-   |:lcfile|
-   |:lcnfile|
-   |:lcpfile|
-   |:lcNfile|
-
-==============================================================================
-4. Status line integration                                *space-statusline*
-
-It is possible to display the current command assigned to <Space> in the
-status line using the GetSpaceMovement() function. Here's an example: >
-
-    function! SlSpace()
-        if exists("*GetSpaceMovement")
-            return "[" . GetSpaceMovement() . "]"
-        else
-            return ""
-        endif
-    endfunc
-    set statusline+=%{SlSpace()}
-
-==============================================================================
-5. Configuration                                       *space-configuration*
-
-It is possible to avoid using the <Space> key for groups of navigation
-commands using global variables. For instance, you may wish to use <Space> to
-repeat the last command only for diff jumps and quickfix and location list
-commands. Here's a list of commands that disable the use of the <Space> key
-
-Disable <Space> for character movements >
-    let g:space_no_character_movements = 1
-
-Disable <Space> for search commands >
-    let g:space_no_search = 1
-
-Disable <Space> for diff jumps >
-    let g:space_no_diff = 1
-
-Disable <Space> for parenthesis and bracket jumps >
-    let g:space_no_brace = 1
-
-Disable <Space> for method jumps >
-    let g:space_no_method = 1
-
-Disable <Space> for section jumps >
-    let g:space_no_section = 1
-
-Disable <Space> for fold movements >
-    let g:space_no_folds = 1
-
-Disable <Space> for quickfix and location list commands >
-    let g:space_no_quickfix = 1
-
-==============================================================================
-6. License                                                   *space-license*
-
-space.vim is licensed under the same terms as Vim itself.
-vim:tw=78:fo=tcq2:isk=!-~,^*,^\|,^\":ts=8:ft=help:norl:
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/space/plugin/space.vim
--- a/vim/bundle/space/plugin/space.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,396 +0,0 @@
-" space.vim - Smart Space key
-" Author:       Henrik Öhman <speeph@gmail.com>
-" URL:          http://github.com/spiiph/vim-space/tree/master
-" Version:      1.7
-" LastChanged:  $LastChangedDate: 2009-04-23 01:42:43 +0200 (to, 23 apr 2009) $
-" Revision:     $Revision: 171 $
-"
-" Licensed under the same terms as Vim itself.
-"
-" NOTE: Using this script has some problems with 'foldopen', since vim won't
-"       open folds if a command is part of a mapping. This is possible to
-"       emulate in Normal mode, and in most cases in Visual mode. Only for
-"       searches using '/' and '?' have I been unsuccessful in finding a
-"       solution.
-" ============================================================================
-
-
-" Set this variable to disable space.vim
-"
-"   let g:loaded_space = 1
-
-" These variables disables the usage of <Space> for groups of different
-" movement commands
-"
-" Disable <Space> for character movements, e.g. fFtT;,
-"   let g:space_no_character_movements = 1
-"
-" Disable <Space> for searches, e.g. /?#*nN
-"   let g:space_no_search = 1
-"
-" Disable <Space> for diff commands, e.g. [c and ]c
-"   let g:space_no_diff = 1
-"
-" Disable <Space> for brace movement commands, e.g. [(, ]), [{ and ]}
-"   let g:space_no_brace = 1
-"
-" Disable <Space> for method movement commands, e.g. [m, ]m, [M and ]M
-"   let g:space_no_method = 1
-"
-" Disable <Space> for section movement commands, e.g. [[, ]], [] and ][
-"   let g:space_no_section = 1
-"
-" Disable <Space> for fold movement commands, e.g. [z, ]z, zj and zk
-"   let g:space_no_folds = 1
-"
-" Disable <Space> for quickfix and location list commands, e.g. :cc, :ll, etc.
-"   let g:space_no_quickfix = 1
-
-" It is possible to display the current command assigned to <Space> in the
-" status line using the GetSpaceMovement() function. Here's an example:
-"
-"   function! SlSpace()
-"       if exists("*GetSpaceMovement")
-"           return "[" . GetSpaceMovement() . "]"
-"       else
-"           return ""
-"       endif
-"   endfunc
-"   set statusline+=%{SlSpace()}
-
-" TODO: Make the mapping assignments more dynamical, and allow user defined
-"       commands?
-
-if exists("g:space_debug")
-    let g:space_no_character_movements = 0
-    let g:space_no_search = 0
-    let g:space_no_diff = 0
-    let g:space_no_brace = 0
-    let g:space_no_method = 0
-    let g:space_no_section = 0
-    let g:space_no_folds = 0
-    let g:space_no_quickfix = 0
-    echomsg "Running space.vim in debug mode."
-elseif exists("g:space_loaded")
-    finish
-endif
-let g:space_loaded = 1
-
-noremap <expr> <silent> <Space>   <SID>do_space(0, "<Space>")
-noremap <expr> <silent> <S-Space> <SID>do_space(1, "<S-Space>")
-noremap <expr> <silent> <BS>      <SID>do_space(1, "<BS>")
-
-" character movement commands
-if !exists("g:space_no_character_movements") || !g:space_no_character_movements
-    noremap <expr> <silent> f <SID>setup_space("char", "f")
-    noremap <expr> <silent> F <SID>setup_space("char", "F")
-    noremap <expr> <silent> t <SID>setup_space("char", "t")
-    noremap <expr> <silent> T <SID>setup_space("char", "T")
-    noremap <expr> <silent> ; <SID>setup_space("char", ";")
-    noremap <expr> <silent> , <SID>setup_space("char", ",")
-endif
-
-" search commands
-if !exists("g:space_no_search") || !g:space_no_search
-    noremap <expr> <silent> *  <SID>setup_space("search", "*")
-    noremap <expr> <silent> #  <SID>setup_space("search", "#")
-    noremap <expr> <silent> g* <SID>setup_space("search", "g*")
-    noremap <expr> <silent> g# <SID>setup_space("search", "g#")
-    noremap <expr> <silent> n  <SID>setup_space("search", "n")
-    noremap <expr> <silent> N  <SID>setup_space("search", "N")
-    let s:search_mappings = 1
-else
-    let s:search_mappings = 0
-endif
-
-" diff next/prev
-if !exists("g:space_no_diff") || !g:space_no_diff
-    noremap <expr> <silent> ]c <SID>setup_space("diff", "]c")
-    noremap <expr> <silent> [c <SID>setup_space("diff", "[c")
-endif
-
-" previous/next unmatched ( or [
-if !exists("g:space_no_brace") || !g:space_no_brace
-    noremap <expr> <silent> ]) <SID>setup_space("paren", "])")
-    noremap <expr> <silent> [( <SID>setup_space("paren", "[(")
-
-    noremap <expr> <silent> ]} <SID>setup_space("curly", "]}")
-    noremap <expr> <silent> [{ <SID>setup_space("curly", "[{")
-endif
-
-" start/end of a method
-if !exists("g:space_no_method") || !g:space_no_method
-    noremap <expr> <silent> ]m <SID>setup_space("method_start", "]m")
-    noremap <expr> <silent> [m <SID>setup_space("method_start", "[m")
-
-    noremap <expr> <silent> ]M <SID>setup_space("method_end", "]M")
-    noremap <expr> <silent> [M <SID>setup_space("method_end", "[M")
-endif
-
-" previous/next section or '}'/'{' in the first column
-if !exists("g:space_no_section") || !g:space_no_section
-    noremap <expr> <silent> ]] <SID>setup_space("section_start", "]]")
-    noremap <expr> <silent> [[ <SID>setup_space("section_start", "[[")
-
-    noremap <expr> <silent> ][ <SID>setup_space("section_end", "][")
-    noremap <expr> <silent> [] <SID>setup_space("section_end", "[]")
-endif
-
-if !exists("g:space_no_folds") || !g:space_no_folds
-    noremap <expr> <silent> zj <SID>setup_space("fold_next", "zj")
-    noremap <expr> <silent> zk <SID>setup_space("fold_next", "zk")
-
-    noremap <expr> <silent> ]z <SID>setup_space("fold_start", "]z")
-    noremap <expr> <silent> [z <SID>setup_space("fold_start", "[z")
-endif
-
-
-" quickfix and location list commands
-if !exists("g:space_no_quickfix") || !g:space_no_quickfix
-    cnoremap <expr> <CR> <SID>parse_cmd_line()
-    let s:quickfix_mappings = 1
-else
-    let s:quickfix_mappings = 0
-endif
-
-" TODO: Have all mappings add the remapped sequence to a list, and use that
-"       list to remove mappings.
-command! SpaceRemoveMappings call <SID>remove_space_mappings()
-function! s:remove_space_mappings()
-    silent! unmap <Space>
-    silent! unmap <S-Space>
-    silent! unmap <BS>
-
-    silent! unmap f
-    silent! unmap F
-    silent! unmap t
-    silent! unmap T
-    silent! unmap ;
-    silent! unmap ,
-
-    silent! unmap *
-    silent! unmap #
-    silent! unmap g*
-    silent! unmap g#
-    silent! unmap n
-    silent! unmap N
-
-    silent! unmap ]c
-    silent! unmap [c
-
-    silent! unmap [(
-    silent! unmap ])
-    silent! unmap [{
-    silent! unmap ]}
-
-    silent! unmap ]]
-    silent! unmap [[
-    silent! unmap ][
-    silent! unmap []
-
-    silent! unmap ]m
-    silent! unmap [m
-    silent! unmap ]M
-    silent! unmap [M
-
-    silent! unmap zj
-    silent! unmap zk
-    silent! unmap ]z
-    silent! unmap [z
-
-    silent! cunmap <CR>
-
-    silent! unlet g:loaded_space
-endfunction
-
-" TODO: Check if the '\>!\=' part of the pattern fails when 'iskeyword'
-"       contains '!'
-" NOTE: Since Vim allows commands like ":'k,'lvim /foo/ *", it's a little
-"       tedious to write a perfect regexp. 
-let s:qf_re = '\%(' .
-    \ 'mak\%[e]\|' . 
-    \ 'v\%[imgrep]\|' . 
-    \ 'gr\%[ep]\|' .
-    \ 'c\%(' .
-    \   'c\|' .
-    \   'p\%[revious]\|' .
-    \   '[nN]\%[ext]\|' .
-    \   '\(fir\|la\)\%[st]\|' .
-    \   'r\%[ewind]\|' .
-    \   '\(f\|nf\|Nf\|pf\)\%[ile]' .
-    \   '\)' .
-    \ '\)\>!\='
-
-let s:lf_re = 'l\%(' .
-    \ 'mak\%[e]\|' . 
-    \ 'v\%[imgrep]\|' . 
-    \ 'gr\%[ep]\|' .
-    \ 'l\|' .
-    \ 'p\%[revious]\|' .
-    \ 'ne\%[xt]\|N\%[ext]\|' .
-    \ '\(fir\|la\)\%[st]\|' .
-    \ 'r\%[ewind]\|' .
-    \ '\(f\|nf\|Nf\|pf\)\%[ile]' .
-    \ '\)\>!\='
-
-function! s:parse_cmd_line()
-    let cmd = getcmdline()
-    let type = getcmdtype()
-
-    if s:search_mappings && (type == '/' || type == '?')
-        return <SID>setup_space("search", cmd)
-    elseif s:quickfix_mappings && type == ':'
-        if cmd =~ s:lf_re
-            return <SID>setup_space("lf", cmd)
-        elseif cmd =~ s:qf_re
-            return <SID>setup_space("qf", cmd)
-        endif
-    end
-    return "\<CR>"
-endfunc
-
-function! s:setup_space(type, command)
-    let cmd = a:command
-    let s:cmd_type = "undefined"
-
-    if a:type == "char"
-        let s:space_move = ";"
-        let s:shift_space_move = ","
-        let s:cmd_type = "hor"
-        if cmd =~ "[;,]$"
-            let cmd = <SID>maybe_open_fold(cmd)
-        endif
-    elseif a:type == "diff"
-        let s:space_move = "]c"
-        let s:shift_space_move = "[c"
-    elseif a:type == "method_start"
-        let s:space_move = "]m"
-        let s:shift_space_move = "[m"
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "method_end"
-        let s:space_move = "]M"
-        let s:shift_space_move = "[M"
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "section_start"
-        let s:space_move = "]]"
-        let s:shift_space_move = "[["
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "section_end"
-        let s:space_move = "]["
-        let s:shift_space_move = "[]"
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "paren"
-        let s:space_move = "])"
-        let s:shift_space_move = "[("
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "curly"
-        let s:space_move = "]}"
-        let s:shift_space_move = "[{"
-        let s:cmd_type = "block"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "fold_next"
-        let s:space_move = "zj"
-        let s:shift_space_move = "zk"
-    elseif a:type == "fold_start"
-        let s:space_move = "]z"
-        let s:shift_space_move = "[z"
-    elseif a:type == "search"
-        let s:space_move = "n"
-        let s:shift_space_move = "N"
-        let s:cmd_type = "search"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "qf"
-        let s:space_move = "cn"
-        let s:shift_space_move = "cN"
-        let s:cmd_type = "quickfix"
-        let cmd = <SID>maybe_open_fold(cmd)
-    elseif a:type == "lf"
-        let s:space_move = "lne"
-        let s:shift_space_move = "lN"
-        let s:cmd_type = "quickfix"
-        let cmd = <SID>maybe_open_fold(cmd)
-    endif
-    call <SID>debug_msg("setup_space(type = " . a:type .
-        \ ", command = " . cmd . ")")
-    return cmd
-endfunc
-
-function! s:do_space(shift, default)
-    " <Space>
-    if a:shift == 0
-        if exists("s:space_move")
-            let cmd = <SID>maybe_open_fold(s:space_move)
-            call <SID>debug_msg("do_space(cmd = " . cmd . ")")
-        else
-            let cmd = a:default
-        endif
-    " <S-Space> and <BS>
-    else
-        if exists("s:shift_space_move")
-            let cmd = <SID>maybe_open_fold(s:shift_space_move)
-            call <SID>debug_msg("do_space(cmd = " . cmd . ")")
-        else
-            let cmd = a:default
-        endif
-    endif
-    return cmd
-endfunc
-
-function! s:maybe_open_fold(cmd)
-    if !exists("g:space_no_foldopen") && &foldopen =~ s:cmd_type
-        " special treatment of :ex commands
-        if s:cmd_type == "quickfix"
-            if getcmdtype() == ':'
-                return "\<CR>zv"
-            else
-                return ":\<C-u>" . (v:count ? v:count : "") . a:cmd . "\<CR>zv"
-            endif
-        " special treatment of /foo and ?foo commands
-        elseif s:cmd_type == "search" && getcmdtype() =~ "[/?]"
-            return "\<CR>zv"
-        else
-            if mode() =~ "[vV]"
-                " NOTE: That this works is probably a bug in vim.  Let's hope
-                "       it stays that way. ;)
-                return ":\<C-u>normal! gv" . (v:count ? v:count : "")
-                    \ . a:cmd . "zv\<CR>"
-                "return a:cmd . "zv"
-            else
-                return a:cmd . "zv"
-            endif
-        endif
-    else
-        if s:cmd_type == "quickfix" 
-            if getcmdtype() == ':'
-                return "\<CR>"
-            else
-                return ":\<C-u>" . (v:count ? v:count : "") . a:cmd . "\<CR>"
-            endif
-        elseif s:cmd_type == "search" && getcmdtype() =~ "[/?]"
-            return "\<CR>"
-        else
-            return a:cmd
-        endif
-    endif
-endfunc
-
-function! s:debug_msg(string)
-    if exists("g:space_debug")
-        echomsg a:string
-    endif
-endfunc
-
-function! GetSpaceMovement()
-    if exists("s:space_move")
-        return s:space_move
-    else
-        return ""
-    end
-endfunc
-
-" vim: et sts=4 sw=4
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/space/test/tests.txt
--- a/vim/bundle/space/test/tests.txt	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-= Quick test
-  = normal (+folded/-folded)
-    + f<Space><S-Space>
-    + /foo<CR><Space><S-Space>
-    + n<Space><S-Space>
-    + ]}<Space><S-Space>
-    + ]m<Space><S-Space>
-    + ]]<Space><S-Space>
-    + zj<Space><S-Space>
-    + [z<Space><S-Space>
-    + :cc<CR><Space><S-Space>
-    + :ll<CR><Space><S-Space>
-  = visual (-folded)
-    + f<Space><S-Space>
-    + /foo<CR><Space><S-Space>
-    + n<Space><S-Space>
-    + ]}<Space><S-Space>
-    + ]m<Space><S-Space>
-    + ]]<Space><S-Space>
-    + zj<Space><S-Space>
-    + [z<Space><S-Space>
-  = visual (+folded)
-    / /foo<CR><Space><S-Space>
-    + n<Space><S-Space>
-    + ]m<Space><S-Space>
-    + ]]<Space><S-Space>
-    + zj<Space><S-Space>
-  = normal (no foldopen)
-    + f<Space><S-Space>
-    + /foo<CR><Space><S-Space>
-    + n<Space><S-Space>
-    + ]}<Space><S-Space>
-    + ]m<Space><S-Space>
-    + ]]<Space><S-Space>
-    + zj<Space><S-Space>
-    + [z<Space><S-Space>
-    + :cc<CR><Space><S-Space>
-    + :ll<CR><Space><S-Space>
-  = visual (no foldopen)
-    + /foo<CR><Space><S-Space>
-    + n<Space><S-Space>
-    + ]m<Space><S-Space>
-    + ]]<Space><S-Space>
-    + zj<Space><S-Space>
-    + [z<Space><S-Space>
-
-= Test normal mode mappings
-  + f
-  + F
-  + t
-  + T
-  + ;
-  + ,
-  + *
-  + g*
-  + #
-  + g#
-  + /
-  + ?
-  + n
-  + N
-  + ]c
-  + [c
-  + ])
-  + [(
-  + ]}
-  + [{
-  + ]m
-  + [m
-  + ]M
-  + [M
-  + ]]
-  + [[
-  + ][
-  + []
-
-= Test visual mode mappings
-  + f
-  + F
-  + t
-  + T
-  + ;
-  + ,
-  + *
-  + g*
-  + #
-  + g#
-  + /
-  + ?
-  + n
-  + N
-  + ]c
-  + [c
-  + ])
-  + [(
-  + ]}
-  + [{
-  + ]m
-  + [m
-  + ]M
-  + [M
-  + ]]
-  + [[
-  + ][
-  + []
-
-= Test quickfix and location list commands
-  + :cc
-  + :cp
-  + :cN
-  + :cn
-  + :cfir
-  + :cla
-  + :cr
-  - :cf
-  + :cnf
-  + :cNf
-  + :cpf
-  + :ll
-  + :lp
-  + :lN
-  + :lne
-  + :lfir
-  + :lla
-  + :lr
-  - :lf
-  + :lnf
-  + :lNf
-  + :lpf
-
-= Test folding
-" set foldopen=hor,search,block,quickfix
-  + f       hor
-  + F       hor
-  + t       hor
-  + T       hor
-  + ;       hor
-  + ,       hor
-  + *       search
-  + g*      search
-  + #       search
-  + g#      search
-  / /       search
-  / ?       search
-  + n       search
-  + N       search
-  + ])      block
-  + [(      block
-  + ]}      block
-  + [{      block
-  + ]m      block
-  + [m      block
-  + ]M      block
-  + [M      block
-  + ]]      block
-  + [[      block
-  + ][      block
-  + []      block
-  + :cc     qf
-  + :cp     qf
-  + :cN     qf
-  + :cn     qf
-  + :cfir   qf
-  + :cla    qf
-  + :cr     qf
-  + :ll     qf
-  + :lp     qf
-  + :lN     qf
-  + :lne    qf
-  + :lfir   qf
-  + :lla    qf
-  + :cr     qf
-
-= Test count
-  - 4fx
-  - 4n
-  - 4/foo
-  - :4cn
-  - etc
-  - 4<Space>
-  - :4lvim //
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/vim-peepopen/README.md
--- a/vim/bundle/vim-peepopen/README.md	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-vim-peepopen
-=============
-
-A plugin for the Vim text editor. PeepOpen provides fuzzy search of filenames and paths in a programming project.
-
-Installation
-------------
-
-Get the PeepOpen.app and open it at least once to approve the Mac OS X security dialog.
-
-Standard:
-
-Copy `peepopen.vim` to your `~/.vim/plugin` directory.
-
-With Tim Pope's [Pathogen](http://github.com/tpope/vim-pathogen):
-
-Copy the entire `vim-peepopen` plugin directory to your `~/.vim/bundle` directory.
-
-Usage
------
-
-`<Leader>p` opens the current project directory with the PeepOpen application.
-
-Use the [vim-rooter](http://github.com/airblade/vim-rooter) plugin for automatic assignment of the current working directory for projects stored in Git.
-
-(Leader is mapped to '\' by default)
-
-Credits
--------
-
-- Initial Vim Plugin by [Andrew Stewart](http://www.airbladesoftware.com/).
-- Some plugin boilerplate from [Rein Henrichs](http://reinh.com/).
-
diff -r beeff917055e -r 6bd31aa2672a vim/bundle/vim-peepopen/plugin/peepopen.vim
--- a/vim/bundle/vim-peepopen/plugin/peepopen.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-" plugin/peepopen.vim
-" Author:   Geoffrey Grosenbach <boss@topfunky.com>
-" License:  MIT License
-
-" Install this file as plugin/peepopen.vim.
-
-" If you prefer Command-T, use this snippet in your .gvimrc:
-
-" if has("gui_macvim")
-"   macmenu &File.New\ Tab key=<nop>
-"   map <D-t> <Plug>PeepOpen
-" end
-
-" ============================================================================
-
-" Exit quickly when:
-" - this plugin was already loaded (or disabled)
-" - when 'compatible' is set
-if &cp || exists("g:peepopen_loaded") && g:peepopen_loaded
-  finish
-endif
-let g:peepopen_loaded = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-function s:LaunchPeepOpenViaVim()
-  let cwd = getcwd()
-  silent exe "!open -a PeepOpen " . shellescape(cwd)
-endfunction
-
-command! PeepOpen :call <SID>LaunchPeepOpenViaVim()
-
-noremap <unique> <script> <Plug>PeepOpen <SID>Launch
-noremap <SID>Launch :call <SID>LaunchPeepOpenViaVim()<CR>
-
-if !hasmapto('<Plug>PeepOpen')
-  map <unique> <silent> <Leader>p <Plug>PeepOpen
-endif
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim:set sw=2 sts=2:
diff -r beeff917055e -r 6bd31aa2672a vim/doc/textile.txt
--- a/vim/doc/textile.txt	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-*textile.txt*              Textile for Vim       Last Change: November 3, 2008
-
-===============================================================================
-REQUIREMENTS                                             *textile-requirements*
-
-- ruby - http://ruby-lang.org/ (seperate executable, not compiled in)
-- RedCloth - http://whytheluckystiff.net/ruby/redcloth/
-
-Files with the extension *.textile will auto-detected.  If editing a new file,
-or otherwise, run ":setf textile" to enable textile commands.
-
-
-==============================================================================
-CHANGELOG                                                  *textile-changelog*
-
-0.3     - Fixed keymappings in the documentation
-0.2     - Added multiple colors for headers, and alternating colors for list
-          items
-        - Fixed error in the vim script for TextileRenderBufferToFile
-        - Changed shortcut keys from \tp to \rp (render preview instead of
-          textile preview, since it's file-type specific anyways)
-0.1     - Initial Release
-
-==============================================================================
-COMMANDS                                                    *textile-commands*
-
-h2. Commands
-
-:TextilePreview     - Render the current buffer to a temp file, and open it in
-                      your web browser (OSX only)
-
-                      <Leader>rp
-
-:TextileRenderTab   - ... to a new tab
-
-                      <Leader>rt
-
-:TextileRenderFile  - ... to a file
-
-                      <Leader>rf
-
-<Leader> is \ by default, so <Leader>rp == \rp
-
-==============================================================================
-CREDITS                                                      *textile-credits* 
-
-- "Dominic Mitchell":http://happygiraffe.net/: initial syntax highlighting
-- "Aaron Bieber":http://blog.aaronbieber.com/: improved syntax highlighting 
-- "Tim Harper":http://tim.theenchanter.com/  : improved syntax highlighting,
-                                                plugin
-
-vim:tw=78:noet:wrap:ts=2:expandtab:ft=help:norl:
diff -r beeff917055e -r 6bd31aa2672a vim/ftdetect/kata.vim
--- a/vim/ftdetect/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/Users/sjl/lib/dotfiles/vim/notreallybundles/vimkata/ftdetect/kata.vim
\ No newline at end of file
diff -r beeff917055e -r 6bd31aa2672a vim/ftplugin/kata.vim
--- a/vim/ftplugin/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/Users/sjl/lib/dotfiles/vim/notreallybundles/vimkata/ftplugin/kata.vim
\ No newline at end of file
diff -r beeff917055e -r 6bd31aa2672a vim/ftplugin/textile.vim
--- a/vim/ftplugin/textile.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-" textile.vim
-"
-" Tim Harper (tim.theenchanter.com)
-
-command! -nargs=0 TextileRenderFile call TextileRenderBufferToFile()
-command! -nargs=0 TextileRenderTab call TextileRenderBufferToTab()
-command! -nargs=0 TextilePreview call TextileRenderBufferToPreview()
-noremap <buffer> <Leader>rp :TextilePreview<CR>
-noremap <buffer> <Leader>rf :TextileRenderFile<CR>
-noremap <buffer> <Leader>rt :TextileRenderTab<CR>
-setlocal ignorecase
-setlocal wrap
-setlocal lbr
-
-function! TextileRender(lines)
-  if (system('which ruby') == "")
-    throw "Could not find ruby!"
-  end
-
-  let text = join(a:lines, "\n")
-  let html = system("ruby -e \"def e(msg); puts msg; exit 1; end; begin; require 'rubygems'; rescue LoadError; e('rubygems not found'); end; begin; require 'redcloth'; rescue LoadError; e('RedCloth gem not installed.  Run this from the terminal: sudo gem install RedCloth'); end; puts(RedCloth.new(\\$stdin.read).to_html(:textile))\"", text)
-  return html
-endfunction
-
-function! TextileRenderFile(lines, filename)
-  let html = TextileRender(getbufline(bufname("%"), 1, '$'))
-  let html = "<html><head><title>" . bufname("%") . "</title><body>\n" . html . "\n</body></html>"
-  return writefile(split(html, "\n"), a:filename)
-endfunction
-
-function! TextileRenderBufferToPreview()
-  let filename = "/tmp/textile-preview.html"
-  call TextileRenderFile(getbufline(bufname("%"), 1, '$'), filename)
-
-  " Modify this line to make it compatible on other platforms
-  call system("open -a Safari ". filename)
-endfunction
-
-function! TextileRenderBufferToFile()
-  let filename = input("Filename:", substitute(bufname("%"), "textile$", "html", ""), "file")
-  call TextileRenderFile(getbufline(bufname("%"), 1, '$'), filename)
-  echo "Rendered to '" . filename . "'"
-endfunction
-
-function! TextileRenderBufferToTab()
-  let html = TextileRender(getbufline(bufname("%"), 1, '$'))
-  tabnew
-  call append("^", split(html, "\n"))
-  set syntax=html
-endfunction
-
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/INSTALL
--- a/vim/notreallybundles/vimkata/INSTALL	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-I haven't created a proper plugin for this project yet.
-For now, create the following symlinks to the corresponding files in this tree:
-
-~/.vim/ftdetect/kata.vim
-~/.vim/ftplugin/kata.vim
-~/.vim/syntax/kata.vim
-
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/README
--- a/vim/notreallybundles/vimkata/README	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-= VimKata: The path to Vim Mastery
-
-VimKata is a series of exercises specially graded to progressively develop your
-skills in the venerable vim editor.
-
-    Tell me and I'll forget;
-    Show me and I may remember;
-    Involve me and I'll understand.
-                 -- Chinese Proverb
-
-VimKata assumes the student has taken VimTutor before and feels somewhat comfortable with the concepts there.  Our objective is to bring the student from the basic lessons learned in VimTutor to a place of mastery--both of the VimTutor concepts as well as more advanced concepts.
-
-VimKata is intended to unite the discipline of martial arts to the methods of modern science.  The premise for the learning style of VimKata is what psychologists call "Deliberate Practice" which:
-
-	- is explicitly intended to improve performance
-	- reaches for objectives just beyond one's level of competence
-	- provides feedback on results
-	- involves high levels of repetition
-
-(These 4 takeaways are from "What it takes to be great". See also the original paper, "The Role of Deliberate Practice in the Acquisition of Expert Performance.")
-
-The VimKata moves through 6 belts: white, yellow, green, blue, red and black.  After the 6 belts, there will be even more detailed kata for further development (e.g. kata for the NERD Comment plugin, other plugins, etc.)
-
-The project is currently maintained by Duane Johnson and Barry Arthur.
-
-== Quick Start
-
-Once installed, diving into VimKata is as simple as:
-
-  :VimKata <belt>
-
-where <belt> is a color such as white, yellow, green, blue, red, or black.
-
-== Resources
-
-=== Website:
-
-http://github.com/canadaduane/VimKata
-
-=== Katas:
-
-http://github.com/canadaduane/VimKata/blob/master/vim_1_white.kata
-
-=== Bug Tracker / Wiki:
-
-http://github.com/canadaduane/VimKata/issues
-
-=== Source Code:
-
-http://github.com/canadaduane/VimKata
-
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/chatlogs/VimKata_freenode_chat_20100523.log
--- a/vim/notreallybundles/vimkata/chatlogs/VimKata_freenode_chat_20100523.log	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,500 +0,0 @@
-**** BEGIN LOGGING AT Sun May 23 01:53:01 2010
-
-May 23 08:25:25 <canadaduane>	yeah i'm glad you found that stack overflow thread
-May 23 08:25:49 <canadaduane>	kind of puts some objections out there for us to consider
-May 23 08:26:09 <canadaduane>	so...
-May 23 08:26:36 <canadaduane>	what do you think of my thoughts written on the github wiki?
-May 23 08:26:44 <dahu>	i have no objections
-May 23 08:29:42 <dahu>	naming scheme sounds good - i like the story idea
-May 23 08:30:01 <canadaduane>	ok
-May 23 08:30:11 <dahu>	as for vim_1.p et al, I think we can have multiple indexes
-May 23 08:30:22 <dahu>	you suggest something similar with your helptags idea
-May 23 08:30:38 <canadaduane>	yeah, well, I have a question about this area
-May 23 08:30:48 <dahu>	i have no objections to unfolded questions
-May 23 08:31:03 <canadaduane>	do we want to lump all functionality of each type of task into one practice session, or spread them out?
-May 23 08:31:09 <dahu>	have you ever used anki?
-May 23 08:31:15 <canadaduane>	for example, if we have "folding" in chapter 1
-May 23 08:31:17 <canadaduane>	(no)
-May 23 08:31:25 <canadaduane>	should we have "advanced folding" in chapter 2?
-May 23 08:31:32 <canadaduane>	or keep all folding practice in chapter 1
-May 23 08:31:37 <dahu>	no
-May 23 08:31:46 <dahu>	definitely progress with the belts
-May 23 08:31:52 <canadaduane>	ok, good
-May 23 08:31:56 <dahu>	advanced folding should reappear in a higher belt level
-May 23 08:32:25 <canadaduane>	I was thinking our objective should be to provide basic skills, and then tie them together in useful task-oriented ways
-May 23 08:32:26 <dahu>	as an aside, folding may not even appear in level 1
-May 23 08:32:42 <canadaduane>	yes, that may be a good idea :)
-May 23 08:32:46 <canadaduane>	kind of like vimtutor?
-May 23 08:32:50 <dahu>	yes
-May 23 08:32:57 <canadaduane>	sounds good
-May 23 08:33:15 <dahu>	hmm... I wonder
-May 23 08:33:49 <canadaduane>	so what I mean by task-oriented, is we could find clever ways to use things together, such as "comment this block of code" and "tab this block of code over by 2"
-May 23 08:33:53 <canadaduane>	(or whatever)
-May 23 08:34:05 <dahu>	each nugget is a separate concept, sometimes standalone, sometimes related to other concepts
-May 23 08:34:07 <canadaduane>	then we get the benefit of wiring our skills up together in the brain
-May 23 08:34:11 <canadaduane>	right
-May 23 08:34:20 <dahu>	I would like to be able to thread concepts in different ways
-May 23 08:34:26 <dahu>	but that might not be easy to achieve
-May 23 08:34:27 <canadaduane>	yes, me too
-May 23 08:34:36 <canadaduane>	right, because there are so many options
-May 23 08:34:45 <dahu>	let's say we have a big pool (right) of concepts
-May 23 08:35:05 <canadaduane>	yeah, basic concepts
-May 23 08:35:16 <canadaduane>	and then related concepts
-May 23 08:35:17 <dahu>	we might create a vim_1.p that has some of those concepts
-May 23 08:35:29 <canadaduane>	for some reason this reminds me of a game like Mortal Kombat or something
-May 23 08:35:31 <dahu>	and then a vim_patterns.p that has some of the same concepts plus others
-May 23 08:35:38 <canadaduane>	where you learn some basic punches and kicks
-May 23 08:35:43 <canadaduane>	and then get powerful with the combos
-May 23 08:35:44 <canadaduane>	lol
-May 23 08:35:57 <dahu>	(hehe... haven't played games since 2nd year in uni ^_^ )
-May 23 08:36:14 <dahu>	but the story is powerful
-May 23 08:36:20 <dahu>	and if people want to think of it like that
-May 23 08:36:25 <dahu>	then it will help their learning
-May 23 08:36:28 <dahu>	which is all good
-May 23 08:36:46 <canadaduane>	what is vim_patterns.practice? (sorry, I didn't quite understand)
-May 23 08:36:55 <dahu>	pattern matching
-May 23 08:37:03 <dahu>	I was thinking of having separate paths
-May 23 08:37:11 <canadaduane>	oh, I thought we were going to move away from topics
-May 23 08:37:11 <dahu>	one path might be for newbies
-May 23 08:37:14 <canadaduane>	in the filenames?
-May 23 08:37:19 <dahu>	numbered as in vim_1, _2, etc
-May 23 08:37:50 <dahu>	other paths might be names after the concepts they teach (for more advanced users who now know *what* they want to focus on)
-May 23 08:37:57 <dahu>	named*
-May 23 08:38:01 <canadaduane>	Ah, I see
-May 23 08:38:15 <canadaduane>	so we have the color belts for the first round, then separate tracks?
-May 23 08:38:24 <dahu>	well... in martial arts
-May 23 08:38:29 <dahu>	the colours are for newbies
-May 23 08:38:40 <canadaduane>	even black?
-May 23 08:38:46 <dahu>	the black belts have their own separate ranks, called dans
-May 23 08:38:52 <canadaduane>	oh, ok
-May 23 08:38:53 <dahu>	usually around 9 dans
-May 23 08:39:37 <dahu>	we don't have to copy that exactly, but maybe the named threads could be considered for either advanced users...
-May 23 08:39:45 <canadaduane>	idea: why not use .vimkata as the filetype? 
-May 23 08:39:47 <dahu>	or a different way to approach the learning
-May 23 08:39:55 <dahu>	for example, what level do you or I jump in at?
-May 23 08:40:01 <dahu>	Are we a 2 or a 3 or a 4?
-May 23 08:40:11 <dahu>	I know I wanna know more about x, though...
-May 23 08:40:11 <canadaduane>	I'm not sure
-May 23 08:40:16 <canadaduane>	I see
-May 23 08:40:26 <canadaduane>	hmm
-May 23 08:48:49 <canadaduane>	ok, so I think I'm following your plan
-May 23 08:49:00 <canadaduane>	basically we'll have a bunch of "beginner" files
-May 23 08:49:03 <dahu>	yep
-May 23 08:49:16 <dahu>	and they can just be numbered
-May 23 08:49:16 <canadaduane>	but these will become fairly broad in topics, as you suggested in the original txt file
-May 23 08:49:20 <dahu>	(and coloured)
-May 23 08:49:49 <canadaduane>	and then we'll branch off into more advanced topics from there
-May 23 08:49:54 <canadaduane>	so what should the filetype be?
-May 23 08:50:04 <canadaduane>	.vimkata? .practice? .vimpractice?
-May 23 08:50:13 <dahu>	.kata
-May 23 08:50:26 <canadaduane>	I like it
-May 23 08:50:32 <canadaduane>	short and simple :)
-May 23 08:50:33 <dahu>	sorry - that was just a brainstorm
-May 23 08:50:39 <dahu>	not concrete :-)
-May 23 08:50:41 <dahu>	but yes
-May 23 08:50:43 <dahu>	it is short
-May 23 08:50:47 <dahu>	and to the point...
-May 23 08:50:50 <dahu>	does it clash?
-May 23 08:51:25 <canadaduane>	i think it goes well with the project name
-May 23 08:51:47 <dahu>	agreed
-May 23 08:53:13 <canadaduane>	how long should it take to do a kata file (for the user)?
-May 23 08:53:35 <dahu>	hmm... good question...
-May 23 08:53:42 <canadaduane>	20 min?
-May 23 08:53:44 <dahu>	it will depend on the grade, of course
-May 23 08:53:48 <dahu>	seems reasonable
-May 23 08:53:56 <dahu>	just asking around. hangon.
-May 23 08:54:23 <dahu>	anki sets a 20 min learning session by default
-May 23 08:54:24 <canadaduane>	also, is that time target for the "first time" or the "last time"?
-May 23 08:54:27 <dahu>	my wife suggests 15 - 20
-May 23 08:54:34 <dahu>	good point
-May 23 08:54:57 <dahu>	hmm..
-May 23 08:55:03 <canadaduane>	so maybe for intermediate
-May 23 08:55:05 <dahu>	i'd say that should be the learn time...
-May 23 08:55:14 <dahu>	the goal time should be *much* quicker
-May 23 08:55:16 <dahu>	right?
-May 23 08:55:25 <canadaduane>	right
-May 23 08:56:16 <canadaduane>	I think we could say something like this though: "Each kata will take you about 20 minutes, but possibly longer for your first attempt.  If you reach 5 minutes or less, you've mastered it."
-May 23 08:56:28 <dahu>	that sounds good
-May 23 08:57:02 <canadaduane>	so this time target actually limits us quite a bit with our "belts" idea
-May 23 08:57:09 <canadaduane>	what we can pack into 20 minutes for a beginner
-May 23 08:57:13 <dahu>	maybe
-May 23 08:57:18 <canadaduane>	might not be the full scope of everything you mentioned in the .txt
-May 23 08:57:30 <canadaduane>	but anyway, I think it's a good target
-May 23 08:57:34 <canadaduane>	so we should work with it
-May 23 08:57:36 <dahu>	no - just have less nuggets in the file
-May 23 08:57:38 <canadaduane>	and split things out as necessary
-May 23 08:57:45 <dahu>	agreed
-May 23 08:58:46 <dahu>	as you go up in levels, your skills will be improving, so you're faster at doing the simpler things (covered in lower belt levels)
-May 23 08:59:10 <canadaduane>	right
-May 23 08:59:11 <canadaduane>	good point
-May 23 08:59:19 <canadaduane>	Great! I'm pumped
-May 23 08:59:26 <canadaduane>	this is going to be really useful
-May 23 09:00:38 <dahu>	me too. It sounds good. I've wanted to do a project like this for a while now
-May 23 09:00:49 <dahu>	I never thought it would be based on vim, though. lol
-May 23 09:00:54 <canadaduane>	heh
-May 23 09:01:04 <dahu>	I mean, I've wanted to do an OSS project
-May 23 09:01:05 <canadaduane>	oh, btw, I have seen anki before
-May 23 09:01:13 <canadaduane>	I haven't used it, but something similar called spicy elephant
-May 23 09:01:18 <dahu>	cool. I use it to study Chinese
-May 23 09:01:24 <canadaduane>	nice
-May 23 09:02:01 <dahu>	i was dreaming of incorporating some of the spaced repetition algorithms into our learning paths
-May 23 09:02:51 <canadaduane>	wow, that would be quite something... in vim
-May 23 09:03:01 <canadaduane>	hey so the github issue tracker has upvoting
-May 23 09:03:04 <canadaduane>	so i was thinking...
-May 23 09:03:14 <canadaduane>	we could go around the vim wiki collecting tidbits
-May 23 09:03:19 <canadaduane>	and also invite others to help out
-May 23 09:03:36 <canadaduane>	and then use the issue tracker as a way of both voting on what should be included and making corrections
-May 23 09:03:37 <dahu>	you might have to explain more - upvoting?
-May 23 09:03:41 <dahu>	ok
-May 23 09:03:42 <dahu>	ic
-May 23 09:03:53 <canadaduane>	not at first of course
-May 23 09:03:58 <canadaduane>	we need to make a skeleton ourselves
-May 23 09:04:02 <dahu>	agreed
-May 23 09:04:08 <canadaduane>	but the community has so much to offer here
-May 23 09:04:18 <dahu>	we might go through a few iterations before we're happy
-May 23 09:04:24 <canadaduane>	I am a very small "vim user" :)
-May 23 09:04:28 <dahu>	let's do that inside the fence before inviting a crowd :-)
-May 23 09:04:34 <canadaduane>	sounds good
-May 23 09:04:49 <dahu>	i have spoken to some of the #vim gurus about deliberate practice
-May 23 09:04:54 <dahu>	and it falls on deaf ears
-May 23 09:05:05 <canadaduane>	interesting, but that's fine
-May 23 09:05:06 <dahu>	but I think, if we build it, they will come :-)
-May 23 09:05:21 <canadaduane>	they don't have to recognize a great thing until it slaps them in the face
-May 23 09:05:22 <canadaduane>	hehe
-May 23 09:05:26 <canadaduane>	what you said
-May 23 09:05:28 <canadaduane>	:)
-May 23 09:05:48 <canadaduane>	So it sounds like my original file format is going to work pretty much as is?
-May 23 09:05:56 <canadaduane>	We'll keep the answers folded
-May 23 09:05:59 <canadaduane>	but the questions open
-May 23 09:06:00 <dahu>	oh
-May 23 09:06:02 <dahu>	one thing
-May 23 09:06:05 <canadaduane>	sure
-May 23 09:06:12 <dahu>	not sure if I like the leading > in the answers...
-May 23 09:06:16 <dahu>	wanna explain the point?
-May 23 09:06:31 <canadaduane>	it was only for making it a different color
-May 23 09:06:47 <dahu>	the folded answer block not obvious enough? ;-)
-May 23 09:06:47 <canadaduane>	but I'm happy with anything that makes it easy to read and differentiate
-May 23 09:07:29 <canadaduane>	Actually, there might be a good use for some kind of marker
-May 23 09:07:40 <canadaduane>	I noticed you provided some alternate answers
-May 23 09:07:44 <canadaduane>	and that made sense to me
-May 23 09:07:53 <canadaduane>	I think we should have a "canonical" answer
-May 23 09:07:57 <canadaduane>	and then 1 or 2 alternates
-May 23 09:07:59 <dahu>	yep - I'd like to separate them - so it's clear they are alternates
-May 23 09:08:04 <dahu>	fine
-May 23 09:08:04 <canadaduane>	right
-May 23 09:08:06 <dahu>	sounds good
-May 23 09:08:12 <canadaduane>	so maybe that could be the purpose of color coding there
-May 23 09:08:32 <canadaduane>	how should we designate the lines that are "canonical"? with a ">" ?
-May 23 09:08:32 <dahu>	one colour for the definitive answer? a separate colour for alternates?
-May 23 09:08:37 <canadaduane>	right
-May 23 09:08:41 <canadaduane>	that's what I was thinking
-May 23 09:08:44 <dahu>	urgh.... lemme think about it...
-May 23 09:08:47 <dahu>	can I just dump a few crazy ideas I've had about this on you? I'm not suggesting that we can implement all of these, or maybe any...
-May 23 09:08:53 <canadaduane>	sure
-May 23 09:08:58 <dahu>	idea 1:
-May 23 09:09:08 <dahu>	executing the definitive answer
-May 23 09:09:14 <dahu>	do this on the 'practice' block
-May 23 09:09:23 <dahu>	as a demonstration of workingness
-May 23 09:09:32 <dahu>	crazy idea 2: timing
-May 23 09:09:46 <dahu>	have the user start his practice session which kicks off a timer
-May 23 09:09:57 <dahu>	when he's done, he's shown the time
-May 23 09:10:21 <dahu>	there are more CI, but when I explain one, the others flee :-)
-May 23 09:10:31 <canadaduane>	heh
-May 23 09:10:53 <canadaduane>	I like idea 1
-May 23 09:10:58 <canadaduane>	idea 2, not sure if it's important
-May 23 09:11:43 <dahu>	idea 2: hmm... only in that it might serve as nice feedback. Well done, you're 3 minutes under your personal best today!    that sort of thing...
-May 23 09:11:58 <canadaduane>	I see
-May 23 09:12:14 <dahu>	initially I didn't like your > because I thought it might clash with idea 1
-May 23 09:12:20 <dahu>	but now I see it will actually help
-May 23 09:12:27 <dahu>	so, liking the > now :-)
-May 23 09:12:56 <canadaduane>	what I meant was it might not be important for us to implement as part of the practice since people can time themselves
-May 23 09:13:04 <canadaduane>	but maybe as a feature later on...
-May 23 09:13:15 <dahu>	of course
-May 23 09:13:33 <canadaduane>	you know what
-May 23 09:13:35 <canadaduane>	I take that all back
-May 23 09:13:38 <canadaduane>	timing is really important
-May 23 09:13:44 <canadaduane>	that's one of the reasons DP works
-May 23 09:13:50 <dahu>	ok
-May 23 09:13:53 <dahu>	that sounds fair
-May 23 09:13:56 <canadaduane>	you have to have a clear objective
-May 23 09:14:05 <canadaduane>	what are we trying to help users do? lower their time
-May 23 09:14:25 <dahu>	ok - an objectives brainstorm
-May 23 09:14:33 <dahu>	lower times
-May 23 09:14:39 <dahu>	increase knowledge
-May 23 09:14:43 <dahu>	(skills)
-May 23 09:15:27 <canadaduane>	right
-May 23 09:15:29 <dahu>	identify bad habbits
-May 23 09:15:34 <dahu>	and correct them
-May 23 09:16:00 <dahu>	hmm... just had another crazy idea... but it reminds me too much of the paperclip to even utter it :-)
-May 23 09:26:28 <dahu>	you mentioned taking stuff from the vim wiki, which I fully agree with. This vim tips page also has an unordered mess of useful nuggets too: http://rayninfo.co.uk/vimtips.html
-May 23 09:26:49 <dahu>	but we'll want to be... judicious about checking our facts.
-May 23 09:28:12 <dahu>	some of the #vim gurus criticise the vim wiki as being populated by newbies as they discover a new vim trick, quite often not showing the full story or abusing a tool for an unintended purpose (missing the canonical tool vim does provide for that purpose)
-May 23 09:28:24 <dahu>	just saying, we need to make sure we're promoting good practice
-May 23 09:28:34 <dahu>	best, even, where appropriate
-May 23 09:37:28 <canadaduane>	back
-May 23 09:37:42 <canadaduane>	I agree with everything you said while I was away :)
-May 23 09:38:12 <canadaduane>	so your talk of objectives reminded me of a "touch typing" course I took in high school
-May 23 09:38:21 <canadaduane>	it was actually very much like this DP idea
-May 23 09:38:25 <canadaduane>	and it had some similar objectives
-May 23 09:38:53 <canadaduane>	I had forgotten about the "identify bad habits"-related objective of "minimizing typing mistakes"
-May 23 09:38:58 <canadaduane>	I think this is an important one as well
-May 23 09:39:03 <dahu>	agreed
-May 23 09:39:08 <canadaduane>	the way they integrated the idea
-May 23 09:39:13 <canadaduane>	was by penalizing the time for mistakes
-May 23 09:39:28 <canadaduane>	so if you were typing at a good 90 WPM but made several mistakes and had to back up and re-type
-May 23 09:39:32 <canadaduane>	you were double-penalized
-May 23 09:39:33 <dahu>	i think there is a lot of overlap with these ideas over the years, but I hadn't put them together until recently - reading Ericsson's stuff
-May 23 09:39:42 <dahu>	right
-May 23 09:39:53 <canadaduane>	Can you point me to a link?
-May 23 09:39:57 <dahu>	and that was my last crazy idea - of having vim 'watch' you and comment...
-May 23 09:40:08 <dahu>	but like I said, paperclip territory. :-/
-May 23 09:40:44 <canadaduane>	yes, we'll have to see
-May 23 09:41:31 <canadaduane>	is it possible to create a vim plugin like you seek?
-May 23 09:41:47 <canadaduane>	Compiled C code perhaps?
-May 23 09:42:11 <dahu>	I guess it doesn't really matter what language it's in
-May 23 09:42:18 <dahu>	C might be better for pure portability purposes
-May 23 09:42:21 <dahu>	do you Ruby?
-May 23 09:42:24 <canadaduane>	yeah
-May 23 09:42:31 <dahu>	cool
-May 23 09:42:44 <canadaduane>	Vim plugins can be written in Ruby?
-May 23 09:42:56 <dahu>	maybe we could cut early stuff in ruby - as a good... (yep) proving ground
-May 23 09:43:06 <canadaduane>	interesting
-May 23 09:43:15 <canadaduane>	you'll have to lead the way there, but I'm intrigued
-May 23 09:43:16 <dahu>	https://wincent.com/products/command-t
-May 23 09:43:48 <canadaduane>	nice
-May 23 09:43:49 <dahu>	sorry, a better link would be: https://wincent.com/blog/bringing-textmate-style-command-t-to-vim
-May 23 09:44:17 <dahu>	and some good Ericsson links: http://www.hooversbiz.com/2008/04/14/deliberate-practice-in-the-working-world/
-May 23 09:44:50 <canadaduane>	great! thanks
-May 23 09:45:03 <canadaduane>	wow, this is really good stuff, plugins
-May 23 09:45:09 <canadaduane>	I hadn't realized how much you could do
-May 23 09:45:13 <dahu>	learning vimscript has been my latest project
-May 23 09:45:26 <dahu>	but I will be learning to write Ruby plugins in vim too
-May 23 09:45:41 <dahu>	I intended to use Wincent's plugin as a guide
-May 23 09:45:47 <dahu>	perhaps we could learn each other :-)
-May 23 09:46:09 <dahu>	Ruby is my preferred language
-May 23 09:47:08 <dahu>	Damian Conway has a great vimscript series here: http://www.ibm.com/developerworks/linux/library/l-vim-script-1/index.html
-May 23 09:47:17 <dahu>	i'm eagerly awaiting number 6 - plugins :-)
-May 23 09:48:14 <dahu>	(aside: someone just posted this gem on #vim: http://stackoverflow.com/questions/1218390/what-is-your-most-productive-shortcut-with-vim/1220118#1220118)
-May 23 09:48:28 <canadaduane>	nice
-May 23 09:49:26 <canadaduane>	so I have one more question for discussion
-May 23 09:49:29 <dahu>	ok
-May 23 09:49:37 <canadaduane>	What should we do about the infinite customizations that people make?
-May 23 09:49:38 <canadaduane>	for example,
-May 23 09:49:58 <canadaduane>	I realized that my practice file for NERD Comment includes a reference to the '?' key
-May 23 09:50:04 <canadaduane>	which I remapped to mean "toggle comment"
-May 23 09:50:12 <canadaduane>	in visual momde
-May 23 09:50:13 <canadaduane>	mode
-May 23 09:50:17 <dahu>	hmm... we *should* stick to vanilla vim
-May 23 09:50:32 <dahu>	I have seen this before (Blender), where all the tutorials are given on a vanilla install
-May 23 09:50:45 <dahu>	I think the Ubuntu community does something similar
-May 23 09:50:47 <canadaduane>	so no kata for plugins?
-May 23 09:50:51 <dahu>	no
-May 23 09:50:53 <dahu>	not saying that
-May 23 09:51:01 <dahu>	kata for plugins is fine
-May 23 09:51:11 <canadaduane>	so vanilla vim = (vim + plugins) without customizations
-May 23 09:51:15 <dahu>	yep
-May 23 09:51:19 <canadaduane>	k
-May 23 09:51:21 <canadaduane>	that makes sense
-May 23 09:51:39 <dahu>	if there are customisations, then the kata should be explicit about them
-May 23 09:51:52 <dahu>	say, given the map blah, use it to do blah
-May 23 09:52:00 <canadaduane>	Right
-May 23 09:52:16 <canadaduane>	so I will have to take that part out of the nerd comment kata
-May 23 09:52:38 <dahu>	but every kata that uses that map should mention it (either explicitly, or implicitly through a Dependencies chain)
-May 23 09:53:04 <dahu>	I wonder... can we auto-source the dependent kata...
-May 23 09:53:11 <dahu>	so the maps are inherited
-May 23 09:53:36 <dahu>	might shelve that idea for now.
-May 23 09:53:40 <canadaduane>	sounds complicated
-May 23 09:54:40 <canadaduane>	alright, so plan of attack
-May 23 09:54:58 <canadaduane>	Should we focus entirely on the kata first?
-May 23 09:55:03 <dahu>	yep
-May 23 09:55:09 <dahu>	we need to create a test case
-May 23 09:55:14 <dahu>	that we can throw rocks at
-May 23 09:55:19 <dahu>	that's our core
-May 23 09:55:24 <dahu>	let's get it working
-May 23 09:55:30 <canadaduane>	what do you mean by test case?
-May 23 09:55:39 <dahu>	a single kata
-May 23 09:55:56 <dahu>	that serves as a test of the engine: file format, supporting plugin code, etc
-May 23 09:56:20 <dahu>	like your suggested vimtutor kata
-May 23 09:56:37 <canadaduane>	question about terminology: is a "kata" a group of practices (i.e. a .kata file) or is a "kata" a single question/answer?
-May 23 09:56:50 <dahu>	kata = group
-May 23 09:56:54 <dahu>	i was thinking
-May 23 09:57:00 <canadaduane>	ok
-May 23 09:57:14 <canadaduane>	I see
-May 23 09:57:14 <dahu>	a kata contains a set of related steps
-May 23 09:58:16 <dahu>	ideally, related
-May 23 09:58:39 <dahu>	so - as your issue tracker says: we need our first kata
-May 23 09:59:30 <dahu>	we can also start building a plugin that supports kata mode
-May 23 10:00:32 <dahu>	the 'plugin' doesn't have to be fancy at this stage - it's nothing more than the practice.vim (renamed to kata.vim ?) that we've been playing with, along with some autocmd stuff so .kata files are recognised
-May 23 10:00:44 <dahu>	oh, and the syntax file
-May 23 10:01:00 <canadaduane>	yeah, that syntax file I wrote is pretty rudimentary
-May 23 10:01:04 <canadaduane>	I don't really know much about vim :)
-May 23 10:01:07 <dahu>	that's ok
-May 23 10:01:15 <dahu>	we can put what we have together for now
-May 23 10:01:19 <dahu>	and stepwise refine it
-May 23 10:01:28 <dahu>	release early, release often! :-)
-May 23 10:01:41 <canadaduane>	sounds like a good philosophy
-May 23 10:01:46 <canadaduane>	:)
-May 23 10:02:00 <dahu>	it's one of the OSS mantras
-May 23 10:02:12 <dahu>	ok
-May 23 10:02:20 <dahu>	so, which part do you want to focus on?
-May 23 10:02:24 <canadaduane>	yes, sorry, it's hard to communicate subtlety
-May 23 10:02:45 <canadaduane>	I'd be happy to start the first kata based on vimtutor
-May 23 10:02:52 <canadaduane>	I'm sure I will learn some more just by doing it
-May 23 10:03:06 <dahu>	cool. I look forward to doing your first kata. :-)
-May 23 10:03:19 <dahu>	I'll have a look at bundling the plugin code then
-May 23 10:03:30 <canadaduane>	ok
-May 23 10:03:53 <canadaduane>	Oh, and I'll switch the code and filenames we have so far to reflect the change to ".kata"
-May 23 10:03:57 <dahu>	any idea how long vimtutor takes a newbie to complete?
-May 23 10:04:05 <dahu>	I wonder how long it takes me to do...
-May 23 10:04:12 <dahu>	the name switch sounds good
-May 23 10:04:14 <canadaduane>	It took me about a half hour
-May 23 10:04:29 <dahu>	ok. I'll do it later and see how I go.
-May 23 10:05:27 <dahu>	so you'll need to have slightly less than the vimtutor file for your kata, yeah? So it stays around 20 mins...
-May 23 10:05:49 <canadaduane>	right
-May 23 10:06:17 <dahu>	just had a look - it says it should take 25-30 mins
-May 23 10:06:48 <canadaduane>	Is the license open enough that we can do what we want with it?
-May 23 10:06:57 <dahu>	for vimtutor?
-May 23 10:07:03 <canadaduane>	Should I begin our "story" ?
-May 23 10:07:06 <canadaduane>	yeah, vimtutor
-May 23 10:07:21 <dahu>	just looking now... no mention of license
-May 23 10:07:31 <canadaduane>	k
-May 23 10:07:36 <canadaduane>	probably the same as vim then
-May 23 10:07:48 <dahu>	probably
-May 23 10:07:52 <canadaduane>	GPL compatible
-May 23 10:08:02 <dahu>	three authors are mentioned at the bottom
-May 23 10:08:05 <dahu>	including Bram
-May 23 10:08:18 <dahu>	there's an email
-May 23 10:08:32 <dahu>	if you're worried, you could drop him a line - he might even like the kata idea...
-May 23 10:09:00 <canadaduane>	might as well, it would be courteous at the least
-May 23 10:09:03 <dahu>	bware, I mean, not Bram
-May 23 10:09:12 <canadaduane>	what's the email?
-May 23 10:09:29 <dahu>	bware@mines.colorado.edu
-May 23 10:09:33 <canadaduane>	thx
-May 23 10:09:41 <dahu>	np
-May 23 10:14:08 <canadaduane>	How will we license our project?
-May 23 10:14:14 <canadaduane>	GPL compatible?
-May 23 10:14:20 <canadaduane>	You mentioned CC
-May 23 10:14:38 <canadaduane>	I think there are many variants of CC if I'm not mistaken
-May 23 10:15:05 <dahu>	urgh... I'm not that familiar with the merits of the various licenses
-May 23 10:15:10 <dahu>	I don't mind GPL
-May 23 10:15:29 <dahu>	but I'm not sure if GPL3 is right for our purposes...
-May 23 10:15:39 <canadaduane>	Maybe we can do a dual MIT/GPL type license
-May 23 10:15:40 <dahu>	there are various CC licenses, yes
-May 23 10:15:45 <dahu>	sure
-May 23 10:15:46 <canadaduane>	"take your pick"
-May 23 10:16:05 <dahu>	as long as that works (from both camp
-May 23 10:16:10 <dahu>	's perspectives)
-May 23 10:16:14 <dahu>	damn enter key :-)
-May 23 10:16:48 <dahu>	I'm flexible, so long as it's open source
-May 23 10:16:51 <canadaduane>	yes, as far as I understand, many projects do this nowadays
-May 23 10:16:57 <canadaduane>	makes both camps happy
-May 23 10:16:58 <canadaduane>	and me too
-May 23 10:16:59 <dahu>	cool. then that's fine.
-May 23 10:17:09 <canadaduane>	because then I can use it at work (as opposed to pure GPL projects... :) )
-May 23 10:17:16 <dahu>	agreed
-May 23 10:17:51 <dahu>	not that I think there will be any commercial derivatives of this work, but never say never, eh?
-May 23 10:18:01 <canadaduane>	right
-May 23 10:19:52 <canadaduane>	email sent
-May 23 10:19:55 <dahu>	cool
-May 23 10:20:23 <canadaduane>	DNS Error: Domain name not found
-May 23 10:20:47 <dahu>	i feared that when I saw it was an edu...
-May 23 10:20:52 <canadaduane>	well, I guess he'll be ok with us using it then
-May 23 10:20:59 <canadaduane>	although it means if we use it, we can't license using MIT
-May 23 10:21:17 <canadaduane>	I'll base my work off of it
-May 23 10:21:19 <dahu>	his full name is Robert K. Ware
-May 23 10:21:20 <canadaduane>	but do my own thing
-May 23 10:21:43 <dahu>	i think that's the best way - then it's wholly our work
-May 23 10:21:49 <canadaduane>	yeah
-May 23 10:22:39 <dahu>	nice email. pity he won't see it. :-)
-May 23 10:22:40 <dahu>	ok
-May 23 10:22:53 <canadaduane>	lol
-May 23 10:22:54 <dahu>	what is it, Saturday there?
-May 23 10:22:58 <canadaduane>	yes
-May 23 10:23:13 <dahu>	You'll like it. It was good.
-May 23 10:23:16 <dahu>	:-)
-May 23 10:23:24 <canadaduane>	ha
-May 23 10:24:39 <dahu>	well, time for some DP! :-) I'm gonna dive into Wincent's ruby plugin to see how he did it.
-May 23 10:24:49 <canadaduane>	super
-May 23 10:24:51 <canadaduane>	thanks for the chat
-May 23 10:24:55 <dahu>	same here
-May 23 10:24:59 <dahu>	have a lovely night
-May 23 10:25:03 <canadaduane>	it's been nice meeting you and beginning the work
-May 23 10:25:11 <dahu>	likewise
-May 23 10:25:32 <dahu>	let's stay in touch. My presence on github might be... low in the beginning.
-May 23 10:25:43 <dahu>	(not much of a public contributor yet)
-May 23 10:25:51 <dahu>	but my email contact should be fine
-May 23 10:26:55 <dahu>	(I was having difficulty setting up my ssh for github, so that's another thing I'll look into today)
-May 23 10:27:12 <dahu>	anyway, I'll let you go.
-May 23 10:27:14 <dahu>	bye for now
-May 23 10:28:30 <canadaduane>	take care
-May 23 11:32:16 <canadaduane>	Are you there?
-May 23 11:33:07 <dahu>	yep
-May 23 11:33:17 <canadaduane>	oh good. Question for you
-May 23 11:33:35 <canadaduane>	So in my original practice file, I put the answers *before* the question for one (kind of silly) reason
-May 23 11:33:51 <dahu>	i noticed that... I kinda like after. What's your reasoning?
-May 23 11:33:53 <canadaduane>	It was so I could skip from one question to the next by using "zj" (next fold) command
-May 23 11:34:05 <dahu>	we can code our way around that...
-May 23 11:34:22 <canadaduane>	I might like that
-May 23 11:34:23 <canadaduane>	but
-May 23 11:34:31 <dahu>	I think it makes more logical sense to seek the answer after the question
-May 23 11:34:33 <canadaduane>	it is kind of nice to force the user to get used to navigating folds
-May 23 11:34:39 <dahu>	that is true
-May 23 11:34:40 <canadaduane>	rather than some arbitrary "vim kata" command
-May 23 11:34:54 <canadaduane>	but yeah, the answer before the question is kind of weird
-May 23 11:35:10 <canadaduane>	so here's another possibility
-May 23 11:35:17 <canadaduane>	we could teach the search command / first
-May 23 11:35:27 <canadaduane>	and mark our questions with a common something
-May 23 11:35:30 <canadaduane>	like ~
-May 23 11:35:38 <canadaduane>	or > or whatever
-May 23 11:35:45 <canadaduane>	then doing "n" for next question
-May 23 11:35:56 <canadaduane>	this kind of makes sense to me
-May 23 11:35:56 <dahu>	yeah, I was thinking along those lines... I think you'll find the common /^\w will be sufficient
-May 23 11:36:07 <canadaduane>	since navigating search terms is much more common than navigating folds
-May 23 11:36:12 <dahu>	agreed
-May 23 11:36:31 <dahu>	we could number the steps in the kata...
-May 23 11:36:37 <dahu>	so /^3
-May 23 11:36:52 <canadaduane>	Well, but then you can't press "n" for next
-May 23 11:36:56 <dahu>	and /^\d
-May 23 11:37:02 <canadaduane>	I see
-May 23 11:37:08 <canadaduane>	I wish there were something easier
-May 23 11:37:14 <dahu>	let me have a look at it
-May 23 11:37:27 <dahu>	I'll get back to you later if I find a vimier way
-May 23 11:37:28 <dahu>	:-)
-May 23 11:37:31 <canadaduane>	since ^ and \d are not intuitive for first-time users (esp. if they've never used regexp)
-May 23 11:37:37 <canadaduane>	ok
-May 23 11:37:38 <dahu>	any other concerns?
-May 23 11:37:47 <canadaduane>	No, that was it
-May 23 11:37:52 <canadaduane>	I'm having fun with the first kata
-May 23 11:37:56 <dahu>	you might be able to "story" your way around the /^\d
-May 23 11:37:59 <canadaduane>	I'll check in what I have tonight before going to bed
-May 23 11:38:01 <dahu>	sweet
-May 23 11:38:05 <dahu>	I look forward to seeing it :-D
-May 23 11:38:41 <dahu>	as for the stories (given my lack of bloginess), I'll leave the narratives up to you. :-)
-May 23 11:38:56 <canadaduane>	heh, ok
-May 23 11:39:03 <canadaduane>	but it is open to your review
-May 23 11:39:19 <dahu>	cool
-May 23 11:39:34 <canadaduane>	hey, how about wrapping the numbers in ()?
-May 23 11:39:36 <canadaduane>	(1)
-May 23 11:39:41 <canadaduane>	then search using /(
-May 23 11:39:59 <dahu>	might work... depends on whether we have other () in the file
-May 23 11:40:07 <dahu>	not start of line bound, I mean
-May 23 11:40:24 <dahu>	is     /^(     that ugly?
-May 23 11:40:35 <canadaduane>	well, we can introduce that later
-May 23 11:40:42 <canadaduane>	but /( will get people started
-May 23 11:41:11 <canadaduane>	I like line numbers, but we may have to create a line re-numberer if it gets crazy
-May 23 11:41:15 <dahu>	heh... then     /^<     takes you to the squinting master and his answer     ;-p
-May 23 11:41:25 <canadaduane>	e.g. if we have to insert something between Q2 and Q3 and there are 40 questions...
-May 23 11:41:30 <dahu>	i understand
-May 23 11:41:31 <canadaduane>	hehe
-May 23 11:41:37 <dahu>	that might not be too hard
-May 23 11:41:41 <canadaduane>	k
-May 23 11:41:50 <dahu>	i think i've done similar work for asciidoc numbered lists in the past
-May 23 11:41:59 <dahu>	i'll dig through my old code and have a look
-May 23 11:42:10 <canadaduane>	cool
-May 23 11:42:15 <canadaduane>	thanks for the dialog
-May 23 11:42:16 <canadaduane>	ttyl
-May 23 11:42:25 <dahu>	same here. bye
-May 23 12:26:31 <canadaduane>	ok, headed to bed. Files checked in.
-May 23 12:27:06 <dahu>	sweet. have a good night. :-)
-May 23 12:36:54 *	canadaduane has quit (Quit: canadaduane)
-May 23 12:44:09 *	canadaduane has quit (Client Quit)
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/duane.kata
--- a/vim/notreallybundles/vimkata/duane.kata	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-# Vim Practice
-# by Duane Johnson
-
-Use 'j' to move down.
-
-Use 'k' to move up.
-
-Open the following fold: (move to the line and press 'l', or 'za' to toggle)
-# Here is the fold {{{1
-  1. This folds over 4 lines
-  2. Line 2
-  3. Line 3
-  4. Line 4
-#}}}
-
-#{{{ Answer:
-> :set fdm=manual<Cr>
-> Vjzf
-#}}}
-Create a manual fold:
-  1. Two-line fold
-  2. Second line
-
-#{{{ Answer:
-> zkzk
-#}}}
-Navigate to the previous fold, and then to the one before that.
-
-#{{{ Answer:
-> mm
-#}}}
-Mark this line.
-
-#{{{ Answer:
-> gg
-#}}}
-Move to the top of the file, then return to the mark.
-
-#{{{ Answer:
-> G
-#}}}
-Move to the bottom of the file, then return to the mark.
-
-#{{{ Answer:
-> H
-#}}}
-Move the cursor to the top of the window.
-
-#{{{ Answer:
-> L
-#}}}
-Move the cursor to the bottom of the window.
-
-#{{{ Answer:
-> M
-#}}}
-Move the cursor to the middle of the window.
-
-#{{{ Answer:
-> C-O
-#}}}
-Go back to previous jump (i.e. bottom of the window, top of window, bottom of the file, etc.), then go forward to this.
-
-#{{{ Answer:
-> qqI--<Esc>lwwi--<Esc>jq@q@@
-#}}}
-Using a macro recording, prefix the first and third words of each
-line with a double dash ("--"):
-  one two three four
-  five six seven eight
-  nine ten eleven twelve
-
-#{{{ Answer:
-> "qp
-#}}}
-Display the contents of the register where you recorded the macro:
-
-#{{{ Answer:
-> :s/-/_/g
-> "qy
-#}}}
-Modify the above macro to use underscores instead of dashes, and
-then read the macro back into the register.
-
-#{{{ Answer:
-> V4j?
-#}}}
-Using the NERD Comment plugin, toggle comment these lines:
-  test {
-    this {
-      line
-    }
-  }
-
-#{{{ Answer:
-> gv
-#}}}
-Restore the Visual Mode selection that you just used above.
-
-#{{{ Answer:
-> wds'
-#}}}
-Using the 'surround' plugin, remove the single quotes. 
-  'surround'
-
-#{{{ Answer:
-> wds)
-#}}}
-Remove parentheses:
-  (this is a parenthetical statement)
-
-#{{{ Answer:
-> C-T
-#}}}
-Remove tags:
-  <b>Word</b>
-
-#{{{ Answer:
-> f_xves'vEs]
-#}}}
-Using 'surround', remove the _value and replace with ['value']:
-  config_value
-
-#{{{ Answer:
-> fxvf3s)
-#}}}
-Add parentheses around the x == 3:
-  if x == 3 {
-  }
-
-#{{{ Answer:
-> VjS{
-#}}}
-Surround the above two lines in curly braces.
-
-#{{{ Answer:
-> :reg
-#}}}
-Show the contents of all registers.
-
-#{{{ Answer:
-> "ayy
-#}}}
-Yank the following line into register 'a':
-  A line for register 'a'.
-
-#{{{ Answer:
-> "Ayy
-#}}}
-Append the following line to register 'a':
-  Now register 'a' has two lines.
-
-#{{{ Answer:
-> "ap
-#}}}
-Put the two lines in register 'a' below:
-
-#{{{ Answer:
-> wwdw
-#}}}
-Delete the middle word:
-  Fabulous Text Editing
-
-#{{{ Answer:
-> dd
-#}}}
-Delete this line:
-  You have a job to do.
-
-#{{{ Answer:
-> dd
-#}}}
-And this one:
-  Now show how capable you are!
-
-#{{{ Answer:
-> "2p
-#}}}
-Put the 'You have a job to do' line below, using the register for "two deletes ago":
-
-
-#{{{ Answer:
-> "-p
-#}}}
-Put the word 'Text' below, using the register for "small deletes":
-
-
-#{{{ Answer:
-> f|C
-#}}}
-Change the text from the | mark to the end of the line:
-  This is a sent|ence with stuff that needs to change.
-
-#{{{ Answer:
-> C-T
-#}}}
-In Insert Mode, shift the following line right by 2 tab widths:
-  I feel too left
-
-#{{{ Answer:
-> C-D
-#}}}
-In Insert Mode, shift the following line LEFT by 2 tab widths:
-      I feel too right
-
-#{{{ Answer:
-> word C-O w word
-#}}}
-In Insert Mode, add a word at the | mark, then use a temporary Normal Mode command to skip a word, then insert another word:
-  Feel free to |insert a word.
-
-#{{{ Answer:
-> C-U
-#}}}
-In Insert Mode, delete everything before the |:
-  If you add |words, please clean up after you're done
-
-#{{{ Answer:
-> \sbear<Cr>
-#}}}
-Replace the word 'tiger' with 'bear' in the following three lines:
-  The tiger lived in the jungle.
-  There were no other tigers like this tiger.
-  Tigers are dangerous.
-
-#{{{ Answer:
-> :g/\#/d
-#}}}
-Highlight the following lines and delete those that contain hash symbols:
-  # Comment
-  This is text
-  # Another comment
-  Some more text
-
-#{{{ Answer:
-> :v/\#/d
-#}}}
-Undo the changes, and remove lines that DO NOT contain hash symbols
-
-#{{{ Answer:
-> V4j:g/^/m'<
-#}}}
-Reverse the following lines:
-  1. First line
-  2. Second line
-  3. Third line
-  4. Fourth line
-
-#{{{ Answer:
-> mm
-> (select 4 lines)
-> :g//t'm
-#}}}
-Mark the following line, then select the above 4 lines and copy them to the mark:
-  Mark this line.
-
-#{{{ Answer:
-> :hide e other.txt
-#}}}
-Edit another file in this window, but don't save the changes you've made to this file.
-
-#{{{ Answer:
-> \f
-#}}}
-Open the NERD Explorer as a vertical split window.
-
-#{{{ Answer:
-> s
-#}}}
-Choose a file in the Explorer and then open it in a new vertical split window.
-
-#{{{ Answer:
-> :h
-> CTRL-W_H
-#}}}
-Open a help window, then rearrange as a vertical split.
-
-# vim:foldmethod=marker
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/ftdetect/kata.vim
--- a/vim/notreallybundles/vimkata/ftdetect/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-" Vim filetype plugin
-" Language:		VimKata
-" Maintainer:		Duane Johnson
-
-au BufNewFile,BufRead *.kata  set filetype=kata
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/ftplugin/kata.vim
--- a/vim/notreallybundles/vimkata/ftplugin/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-" Vim filetype plugin
-" Language:		VimKata
-" Maintainer:		Duane Johnson
-
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-" preserve user's options
-let s:save_cpo = &cpo
-set cpo&vim
-
-setlocal commentstring=#%s foldmethod=marker
-setlocal nospell nohlsearch
-
-function! s:Renumber() range
-  let b:k_count = 1
-  exe a:firstline . ',' . a:lastline . "g/^(\\d\\+/s//\\='('.b:k_count/ | let b:k_count += 1"
-endfunction
-
-function! s:GroupRenumber()
-  let group_boundary = '^\[.\{-}\]$'
-  " Locate the boundary of the group we're in
-  let firstline  = search(group_boundary,'bnW') + 1
-  let lastline   = search(group_boundary, 'nW') - 1
-  if lastline < 0
-    let lastline = line('$')
-  endif
-  exe firstline . ',' . lastline 'call s:Renumber()' 
-endfunction
-
-function! s:NextQuestion()
-  call search("^(\\d\\+)")
-  normal j
-endfunction
-
-function! s:NextQuestionWithPrep()
-  call s:NextQuestion()
-  call s:ExecutePreparation()
-endfunction
-
-function! s:PrevQuestion()
-  call s:ThisQuestion()
-  normal k
-  call s:ThisInput()
-endfunction
-
-function! s:ThisQuestion()
-  call search("^(\\d\\+)", "bc")
-endfunction
-
-function! s:ThisInput()
-  call s:ThisQuestion()
-  normal j
-endfunction
-
-function! s:ThisAnswer()
-  call s:ThisQuestion()
-  call search("^>")
-  normal ll
-endfunction
-
-function! s:ThisPreparationLine()
-  call s:ThisQuestion()
-  let prepline = search("^<", "nW")
-  let nextqline = search("^(\\d\\+)", "nW")
-
-  if nextqline < 0
-    nextqline = search("$", "nW")
-  end
-
-  if prepline > 0 && prepline < nextqline
-    return prepline
-  else
-    return -1
-  endif
-endfunction
-
-function! s:ExecuteAnswer()
-  call s:ThisAnswer()
-  exe "normal \"ay$"
-  call s:ThisInput()
-  exe "normal @a"
-endfunction
-
-function! s:ExecutePreparation()
-  let prepline = s:ThisPreparationLine()
-  if prepline > 0
-    exe prepline + "G"
-    normal ll
-    exe "normal \"ay$"
-    call s:ThisInput()
-    exe "normal @a"
-  else
-    call s:ThisInput()
-  end
-endfunction
-
-" maps
-if !hasmapto('<Plug>Renumber')
-  nmap <unique> <LocalLeader>kr <Plug>Renumber
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>Renumber <SID>Renumber
-nnoremap <SID>Renumber ms:1,$ call <SID>Renumber()<CR>`s
-
-if !hasmapto('<Plug>GroupRenumber')
-  nmap <unique> <LocalLeader>kgr <Plug>GroupRenumber
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>GroupRenumber <SID>GroupRenumber
-nnoremap <SID>GroupRenumber ms:call <SID>GroupRenumber()<CR>`s
-
-if !hasmapto('<Plug>NextQuestionWithPrep')
-  nmap <unique> Q <Plug>NextQuestionWithPrep
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>NextQuestionWithPrep <SID>NextQuestionWithPrep
-nnoremap <SID>NextQuestionWithPrep :call <SID>NextQuestionWithPrep()<CR>
-
-if !hasmapto('<Plug>NextQuestion')
-  nmap <unique> <LocalLeader>kn <Plug>NextQuestion
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>NextQuestion <SID>NextQuestion
-nnoremap <SID>NextQuestion :call <SID>NextQuestion()<CR>
-
-if !hasmapto('<Plug>PrevQuestion')
-  nmap <unique> <LocalLeader>kp <Plug>PrevQuestion
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>PrevQuestion <SID>PrevQuestion
-nnoremap <SID>PrevQuestion :call <SID>PrevQuestion()<CR>
-
-if !hasmapto('<Plug>ThisQuestion')
-  nmap <unique> <LocalLeader>kq <Plug>ThisQuestion
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>ThisQuestion <SID>ThisQuestion
-nnoremap <SID>ThisQuestion :call <SID>ThisQuestion()<CR>
-
-if !hasmapto('<Plug>ThisInput')
-  nmap <unique> <LocalLeader>ki <Plug>ThisInput
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>ThisInput <SID>ThisInput
-nnoremap <SID>ThisInput :call <SID>ThisInput()<CR>
-
-if !hasmapto('<Plug>ThisAnswer')
-  nmap <unique> <LocalLeader>ka <Plug>ThisAnswer
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>ThisAnswer <SID>ThisAnswer
-nnoremap <SID>ThisAnswer :call <SID>ThisAnswer()<CR>
-
-if !hasmapto('<Plug>ExecutePreparation')
-  nmap <unique> <LocalLeader>kx <Plug>ExecutePreparation
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>ExecutePreparation <SID>ExecutePreparation
-nnoremap <SID>ExecutePreparation :call <SID>ExecutePreparation()<CR>
-
-if !hasmapto('<Plug>ExecuteAnswer')
-  nmap <unique> <LocalLeader>ke <Plug>ExecuteAnswer
-endif
-nnoremap <unique> <buffer> <silent> <script> <Plug>ExecuteAnswer <SID>ExecuteAnswer
-nnoremap <SID>ExecuteAnswer :call <SID>ExecuteAnswer()<CR>
-
-" restore user's options
-let &cpo = s:save_cpo
-" vim:set sw=2:
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/resources/vim_sites.txt
--- a/vim/notreallybundles/vimkata/resources/vim_sites.txt	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-Vim Sites
-=========
-
-== Blogs ==
-http://dailyvim.blogspot.com/
-http://www.zzapper.co.uk/vim-tips-blog/
-
-== Config ==
-http://github.com/loota/vimfiles/blob/master/vim_usual_options.txt
-
-== Recipes ==
-http://www.oualline.com/vim-cook.html
-
-== Tips ==
-http://rayninfo.co.uk/vimtips.html
-http://www.cs.swarthmore.edu/help/vim/
-http://spf13.com/feature/vim-plugins
-http://www.8t8.us/vim/vim.html
-http://www.ukuug.org/events/linux2004/programme/paper-SMyers/Linux_2004_slides/vim_tips/
-http://stackoverflow.com/questions/1218390/what-is-your-most-productive-shortcut-with-vim/1220118#1220118
-
-== Tutorials ==
-http://blog.smr.co.in/linux/advanced-vim-tutorial/
-
-== Scripting ==
-http://www.ibm.com/developerworks/linux/library/l-vim-script-1/index.html
-http://www.ibm.com/developerworks/linux/library/l-vim-script-2/index.html
-http://www.ibm.com/developerworks/linux/library/l-vim-script-3/index.html
-http://www.ibm.com/developerworks/linux/library/l-vim-script-4/index.html
-http://www.ibm.com/developerworks/linux/library/l-vim-script-5/index.html
-http://www.yolinux.com/TUTORIALS/LinuxTutorialAdvanced_vi.html
-
-== Plugins ==
-http://www.catonmat.net/blog/vim-plugins-surround-vim
-http://linuxgazette.net/152/srinivasan.html
-http://www.derekwyatt.org/vim/vim-tutorial-videos/vim-advanced-tutorial-videos/
-http://www.eng.hawaii.edu/Tutor/vi.html
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/syntax/kata.vim
--- a/vim/notreallybundles/vimkata/syntax/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-" Kata syntax file
-" Language:     VimKata
-" Author:       Barry Arthur <barry.arthur@gmail.com> (based on Duane
-"               Johnson's original practice.vim script).
-" URL:          http://github.com/canadaduane/VimKata
-" Licence:      GPL (http://www.gnu.org) + MIT (url?)
-" Remarks:      Vim 6 or greater
-" Limitations:  See 'Appendix E: Vim Syntax Highlighter' in the AsciiDoc 'User
-"               Guide'.
-
-if exists("b:current_syntax")
-  finish
-endif
-
-syn clear
-syn sync fromstart
-syn sync linebreaks=1
-
-syntax region KataPlainText start="^[a-zA-Z0-9]" end="\n"
-syntax region KataAnswer start="^>" end="\n"
-syntax region KataComment start="#" end="\n"
-
-highlight link KataPlainText Function
-highlight link KataAnswer Define
-highlight link KataComment Comment
-
-let b:current_syntax = "kata"
-
-" vim: wrap et sw=2 sts=2:
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/vim_1_white.kata
--- a/vim/notreallybundles/vimkata/vim_1_white.kata	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,917 +0,0 @@
------------------------------------------------------------------------------+
-|    Vim Kata  -  White Belt (Level 1)                                        |
-+-----------------------------------------------------------------------------+
-
-Welcome, young Vim warrior.  It is an honor to meet someone such as yourself
-who seeks more than a mere grasping of a few concepts along the Vim path.  If
-you discipline your mind and dedicate yourself to the practice of Vim Kata,
-you will learn to edit text like you touch type.  You will feel the flow of
-the text in you, and around you, and by your will you will bend its shape and
-cause it to flow as you see fit.  If you continue to apply yourself and repeat
-the kata each day, then before long, you will join the few who have become
-Masters of Vim.
-
-Each practice session--called a 'kata'--should take about 20 minutes, or a
-little more if it is your first time.  When you have reduced the time to under
-5 minutes, you should move on to the next kata.
-
-You will find the answer to each question marked by a '>'.  You should be able
-to type the answer exactly and get the correct result. Each answer assumes that
-your cursor is positioned on the first character of the line below the question
-
-Tip: Press 'j' to move down.
-
-Tip: To quit this kata at any time, press <ESC>:q! and then press enter.
-Pressing <ESC>:q! will discard any changes.
-
-+-----------------------------------------------------------------------------+
-|    Ready?  Begin!                                                           |
-+-----------------------------------------------------------------------------+
-
-(1)  Move the cursor down:
-
-
-> j
-
-(2) Move the cursor up:
- 
-
-> k
-
-(3) Move the cursor right, then left:
-  
-
-> lh
-
-(4) Follow the path from 'o' to 'x':
-o---|  |--|   |--|
-    |--|  | |-|  |
-  |-----| |-|  |-|
-  |---x |------|
-
-> lllljlllkllljjllkllkllljjhhjhhhhhhhkhhhhhhjllll
-
-(5) Delete the . in the following line:
-.
-
-> x
-
-(6) Delete the .'s in the following lines:
-.*..*.***.*
-***.**.*.**
-
-> xlxxlxlllxjhhxllxlx
-
-(7) Insert the text 'welcome', and return to normal mode:
-
-
-> iwelcome
-
-(8) Insert the missing text in line 1 using line 2 as a guide:
-Exclene is; del prac is wa we.
-Excellence is our goal; deliberate practice is what we praise.
-
-> llliellillllicllllli our goallllllliiberatelllllliticellllllihllitlllli praise
-
-(9) Append 'kata' to the end of this line:
-The end of one kata is the beginning of another
-
-> A kata
-
-(10) Without moving the cursor, append 'ndigo' to the letter 'I':
-I will make the world beautiful.
-
-> andigo
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lesson 1.6: EDITING A FILE
-
-		    ** Use  :wq  to save a file and exit. **
-
-  !! NOTE: Before executing any of the steps below, read this entire lesson!!
-
-  1. Exit this tutor as you did in lesson 1.2:  :q!
-     Or, if you have access to another terminal, do the following there.
-
-  2. At the shell prompt type this command:  vim tutor <ENTER>
-     'vim' is the command to start the Vim editor, 'tutor' is the name of the
-     file you wish to edit.  Use a file that may be changed.
-
-  3. Insert and delete text as you learned in the previous lessons.
-
-  4. Save the file with changes and exit Vim with:  :wq  <ENTER>
-
-  5. If you have quit vimtutor in step 1 restart the vimtutor and move down to
-     the following summary.
-
-  6. After reading the above steps and understanding them: do it.
-  
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 1 SUMMARY
-
-
-  1. The cursor is moved using either the arrow keys or the hjkl keys.
-	 h (left)	j (down)       k (up)	    l (right)
-
-  2. To start Vim from the shell prompt type:  vim FILENAME <ENTER>
-
-  3. To exit Vim type:	   <ESC>   :q!	 <ENTER>  to trash all changes.
-	     OR type:	   <ESC>   :wq	 <ENTER>  to save the changes.
-
-  4. To delete the character at the cursor type:  x
-
-  5. To insert or append text type:
-	 i   type inserted text   <ESC>		insert before the cursor
-	 A   type appended text   <ESC>         append after the line
-
-NOTE: Pressing <ESC> will place you in Normal mode or will cancel
-      an unwanted and partially completed command.
-
-Now continue with Lesson 2.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 2.1: DELETION COMMANDS
-
-
-		       ** Type  dw  to delete a word. **
-
-  1. Press  <ESC>  to make sure you are in Normal mode.
-
-  2. Move the cursor to the line below marked --->.
-
-  3. Move the cursor to the beginning of a word that needs to be deleted.
-
-  4. Type   dw	 to make the word disappear.
-
-  NOTE: The letter  d  will appear on the last line of the screen as you type
-	it.  Vim is waiting for you to type  w .  If you see another character
-	than  d  you typed something wrong; press  <ESC>  and start over.
-
----> There are a some words fun that don't belong paper in this sentence.
-
-  5. Repeat steps 3 and 4 until the sentence is correct and go to Lesson 2.2.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 2.2: MORE DELETION COMMANDS
-
-
-	   ** Type  d$	to delete to the end of the line. **
-
-  1. Press  <ESC>  to make sure you are in Normal mode.
-
-  2. Move the cursor to the line below marked --->.
-
-  3. Move the cursor to the end of the correct line (AFTER the first . ).
-
-  4. Type    d$    to delete to the end of the line.
-
----> Somebody typed the end of this line twice. end of this line twice.
-
-
-  5. Move on to Lesson 2.3 to understand what is happening.
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lesson 2.3: ON OPERATORS AND MOTIONS
-
-
-  Many commands that change text are made from an operator and a motion.
-  The format for a delete command with the  d  delete operator is as follows:
-
-  	d   motion
-
-  Where:
-    d      - is the delete operator.
-    motion - is what the operator will operate on (listed below).
-
-  A short list of motions:
-    w - until the start of the next word, EXCLUDING its first character.
-    e - to the end of the current word, INCLUDING the last character.
-    $ - to the end of the line, INCLUDING the last character.
-
-  Thus typing  de  will delete from the cursor to the end of the word.
-
-NOTE:  Pressing just the motion while in Normal mode without an operator will
-       move the cursor as specified.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lesson 2.4: USING A COUNT FOR A MOTION
-
-
-   ** Typing a number before a motion repeats it that many times. **
-
-  1. Move the cursor to the start of the line marked ---> below.
-
-  2. Type  2w  to move the cursor two words forward.
-
-  3. Type  3e  to move the cursor to the end of the third word forward.
-
-  4. Type  0  (zero) to move to the start of the line.
-
-  5. Repeat steps 2 and 3 with different numbers.
-
----> This is just a line with words you can move around in.
-
-  6. Move on to Lesson 2.5.
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		     Lesson 2.5: USING A COUNT TO DELETE MORE
-
-
-   ** Typing a number with an operator repeats it that many times. **
-
-  In the combination of the delete operator and a motion mentioned above you
-  insert a count before the motion to delete more:
-	 d   number   motion
-
-  1. Move the cursor to the first UPPER CASE word in the line marked --->.
-
-  2. Type  d2w  to delete the two UPPER CASE words
-
-  3. Repeat steps 1 and 2 with a different count to delete the consecutive
-     UPPER CASE words with one command
-
---->  this ABC DE line FGHI JK LMN OP of words is Q RS TUV cleaned up.
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 2.6: OPERATING ON LINES
-
-
-		   ** Type  dd   to delete a whole line. **
-
-  Due to the frequency of whole line deletion, the designers of Vi decided
-  it would be easier to simply type two d's to delete a line.
-
-  1. Move the cursor to the second line in the phrase below.
-  2. Type  dd  to delete the line.
-  3. Now move to the fourth line.
-  4. Type   2dd   to delete two lines.
-
---->  1)  Roses are red,
---->  2)  Mud is fun,
---->  3)  Violets are blue,
---->  4)  I have a car,
---->  5)  Clocks tell time,
---->  6)  Sugar is sweet
---->  7)  And so are you.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 2.7: THE UNDO COMMAND
-
-
-   ** Press  u	to undo the last commands,   U  to fix a whole line. **
-
-  1. Move the cursor to the line below marked ---> and place it on the
-     first error.
-  2. Type  x  to delete the first unwanted character.
-  3. Now type  u  to undo the last command executed.
-  4. This time fix all the errors on the line using the  x  command.
-  5. Now type a capital  U  to return the line to its original state.
-  6. Now type  u  a few times to undo the  U  and preceding commands.
-  7. Now type CTRL-R (keeping CTRL key pressed while hitting R) a few times
-     to redo the commands (undo the undo's).
-
----> Fiix the errors oon thhis line and reeplace them witth undo.
-
-  8. These are very useful commands.  Now move on to the Lesson 2 Summary.
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 2 SUMMARY
-
-
-  1. To delete from the cursor up to the next word type:    dw
-  2. To delete from the cursor to the end of a line type:    d$
-  3. To delete a whole line type:    dd
-
-  4. To repeat a motion prepend it with a number:   2w
-  5. The format for a change command is:
-               operator   [number]   motion
-     where:
-       operator - is what to do, such as  d  for delete
-       [number] - is an optional count to repeat the motion
-       motion   - moves over the text to operate on, such as  w (word),
-		  $ (to the end of line), etc.
-
-  6. To move to the start of the line use a zero:  0
-
-  7. To undo previous actions, type: 	       u  (lowercase u)
-     To undo all the changes on a line, type:  U  (capital U)
-     To undo the undo's, type:		       CTRL-R
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 3.1: THE PUT COMMAND
-
-
-       ** Type	p  to put previously deleted text after the cursor. **
-
-  1. Move the cursor to the first ---> line below.
-
-  2. Type  dd  to delete the line and store it in a Vim register.
-
-  3. Move the cursor to the c) line, ABOVE where the deleted line should go.
-
-  4. Type   p   to put the line below the cursor.
-
-  5. Repeat steps 2 through 4 to put all the lines in correct order.
-
----> d) Can you learn too?
----> b) Violets are blue,
----> c) Intelligence is learned,
----> a) Roses are red,
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 3.2: THE REPLACE COMMAND
-
-
-       ** Type  rx  to replace the character at the cursor with  x . **
-
-  1. Move the cursor to the first line below marked --->.
-
-  2. Move the cursor so that it is on top of the first error.
-
-  3. Type   r	and then the character which should be there.
-
-  4. Repeat steps 2 and 3 until the first line is equal to the second one.
-
---->  Whan this lime was tuoed in, someone presswd some wrojg keys!
---->  When this line was typed in, someone pressed some wrong keys!
-
-  5. Now move on to Lesson 3.3.
-
-NOTE: Remember that you should be learning by doing, not memorization.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 3.3: THE CHANGE OPERATOR
-
-
-	   ** To change until the end of a word, type  ce . **
-
-  1. Move the cursor to the first line below marked --->.
-
-  2. Place the cursor on the  u  in  lubw.
-
-  3. Type  ce  and the correct word (in this case, type  ine ).
-
-  4. Press <ESC> and move to the next character that needs to be changed.
-
-  5. Repeat steps 3 and 4 until the first sentence is the same as the second.
-
----> This lubw has a few wptfd that mrrf changing usf the change operator.
----> This line has a few words that need changing using the change operator.
-
-Notice that  ce  deletes the word and places you in Insert mode.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 3.4: MORE CHANGES USING c
-
-
-     ** The change operator is used with the same motions as delete. **
-
-  1. The change operator works in the same way as delete.  The format is:
-
-         c    [number]   motion
-
-  2. The motions are the same, such as   w (word) and  $ (end of line).
-
-  3. Move to the first line below marked --->.
-
-  4. Move the cursor to the first error.
-
-  5. Type  c$  and type the rest of the line like the second and press <ESC>.
-
----> The end of this line needs some help to make it like the second.
----> The end of this line needs to be corrected using the  c$  command.
-
-NOTE:  You can use the Backspace key to correct mistakes while typing.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 3 SUMMARY
-
-
-  1. To put back text that has just been deleted, type   p .  This puts the
-     deleted text AFTER the cursor (if a line was deleted it will go on the
-     line below the cursor).
-
-  2. To replace the character under the cursor, type   r   and then the
-     character you want to have there.
-
-  3. The change operator allows you to change from the cursor to where the
-     motion takes you.  eg. Type  ce  to change from the cursor to the end of
-     the word,  c$  to change to the end of a line.
-
-  4. The format for change is:
-
-	 c   [number]   motion
-
-Now go on to the next lesson.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  Lesson 4.1: CURSOR LOCATION AND FILE STATUS
-
-  ** Type CTRL-G to show your location in the file and the file status.
-     Type  G  to move to a line in the file. **
-
-  NOTE: Read this entire lesson before executing any of the steps!!
-
-  1. Hold down the Ctrl key and press  g .  We call this CTRL-G.
-     A message will appear at the bottom of the page with the filename and the
-     position in the file.  Remember the line number for Step 3.
-
-NOTE:  You may see the cursor position in the lower right corner of the screen
-       This happens when the 'ruler' option is set (see  :help 'ruler'  )
-
-  2. Press  G  to move you to the bottom of the file.
-     Type  gg  to move you to the start of the file.
-
-  3. Type the number of the line you were on and then  G .  This will
-     return you to the line you were on when you first pressed CTRL-G.
-
-  4. If you feel confident to do this, execute steps 1 through 3.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 4.2: THE SEARCH COMMAND
-
-
-     ** Type  /  followed by a phrase to search for the phrase. **
-
-  1. In Normal mode type the  /  character.  Notice that it and the cursor
-     appear at the bottom of the screen as with the  :	command.
-
-  2. Now type 'errroor' <ENTER>.  This is the word you want to search for.
-
-  3. To search for the same phrase again, simply type  n .
-     To search for the same phrase in the opposite direction, type  N .
-
-  4. To search for a phrase in the backward direction, use  ?  instead of  / .
-
-  5. To go back to where you came from press  CTRL-O  (Keep Ctrl down while
-     pressing the letter o).  Repeat to go back further.  CTRL-I goes forward.
-
---->  "errroor" is not the way to spell error;  errroor is an error.
-NOTE: When the search reaches the end of the file it will continue at the
-      start, unless the 'wrapscan' option has been reset.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   Lesson 4.3: MATCHING PARENTHESES SEARCH
-
-
-	      ** Type  %  to find a matching ),], or } . **
-
-  1. Place the cursor on any (, [, or { in the line below marked --->.
-
-  2. Now type the  %  character.
-
-  3. The cursor will move to the matching parenthesis or bracket.
-
-  4. Type  %  to move the cursor to the other matching bracket.
-
-  5. Move the cursor to another (,),[,],{ or } and see what  %  does.
-
----> This ( is a test line with ('s, ['s ] and {'s } in it. ))
-
-
-NOTE: This is very useful in debugging a program with unmatched parentheses!
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 4.4: THE SUBSTITUTE COMMAND
-
-
-	** Type  :s/old/new/g  to substitute 'new' for 'old'. **
-
-  1. Move the cursor to the line below marked --->.
-
-  2. Type  :s/thee/the <ENTER> .  Note that this command only changes the
-     first occurrence of "thee" in the line.
-
-  3. Now type  :s/thee/the/g .  Adding the  g  flag means to substitute
-     globally in the line, change all occurrences of "thee" in the line.
-
----> thee best time to see thee flowers is in thee spring.
-
-  4. To change every occurrence of a character string between two lines,
-     type   :#,#s/old/new/g    where #,# are the line numbers of the range
-                               of lines where the substitution is to be done.
-     Type   :%s/old/new/g      to change every occurrence in the whole file.
-     Type   :%s/old/new/gc     to find every occurrence in the whole file,
-     			       with a prompt whether to substitute or not.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 4 SUMMARY
-
-
-  1. CTRL-G  displays your location in the file and the file status.
-             G  moves to the end of the file.
-     number  G  moves to that line number.
-            gg  moves to the first line.
-
-  2. Typing  /	followed by a phrase searches FORWARD for the phrase.
-     Typing  ?	followed by a phrase searches BACKWARD for the phrase.
-     After a search type  n  to find the next occurrence in the same direction
-     or  N  to search in the opposite direction.
-     CTRL-O takes you back to older positions, CTRL-I to newer positions.
-
-  3. Typing  %	while the cursor is on a (,),[,],{, or } goes to its match.
-
-  4. To substitute new for the first old in a line type    :s/old/new
-     To substitute new for all 'old's on a line type	   :s/old/new/g
-     To substitute phrases between two line #'s type	   :#,#s/old/new/g
-     To substitute all occurrences in the file type	   :%s/old/new/g
-     To ask for confirmation each time add 'c'		   :%s/old/new/gc
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lesson 5.1: HOW TO EXECUTE AN EXTERNAL COMMAND
-
-
-   ** Type  :!	followed by an external command to execute that command. **
-
-  1. Type the familiar command	:  to set the cursor at the bottom of the
-     screen.  This allows you to enter a command-line command.
-
-  2. Now type the  !  (exclamation point) character.  This allows you to
-     execute any external shell command.
-
-  3. As an example type   ls   following the ! and then hit <ENTER>.  This
-     will show you a listing of your directory, just as if you were at the
-     shell prompt.  Or use  :!dir  if ls doesn't work.
-
-NOTE:  It is possible to execute any external command this way, also with
-       arguments.
-
-NOTE:  All  :  commands must be finished by hitting <ENTER>
-       From here on we will not always mention it.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 5.2: MORE ON WRITING FILES
-
-
-     ** To save the changes made to the text, type  :w FILENAME. **
-
-  1. Type  :!dir  or  :!ls  to get a listing of your directory.
-     You already know you must hit <ENTER> after this.
-
-  2. Choose a filename that does not exist yet, such as TEST.
-
-  3. Now type:	 :w TEST   (where TEST is the filename you chose.)
-
-  4. This saves the whole file (the Vim Tutor) under the name TEST.
-     To verify this, type    :!dir  or  :!ls   again to see your directory.
-
-NOTE: If you were to exit Vim and start it again with  vim TEST , the file
-      would be an exact copy of the tutor when you saved it.
-
-  5. Now remove the file by typing (MS-DOS):    :!del TEST
-				or (Unix):	:!rm TEST
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lesson 5.3: SELECTING TEXT TO WRITE
-
-
-	** To save part of the file, type  v  motion  :w FILENAME **
-
-  1. Move the cursor to this line.
-
-  2. Press  v  and move the cursor to the fifth item below.  Notice that the
-     text is highlighted.
-
-  3. Press the  :  character.  At the bottom of the screen  :'<,'> will appear.
-
-  4. Type  w TEST  , where TEST is a filename that does not exist yet.  Verify
-     that you see  :'<,'>w TEST  before you press Enter.
-
-  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  !ls
-     to see it.  Do not remove it yet!  We will use it in the next lesson.
-
-NOTE:  Pressing  v  starts Visual selection.  You can move the cursor around
-       to make the selection bigger or smaller.  Then you can use an operator
-       to do something with the text.  For example,  d  deletes the text.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   Lesson 5.4: RETRIEVING AND MERGING FILES
-
-
-       ** To insert the contents of a file, type  :r FILENAME  **
-
-  1. Place the cursor just above this line.
-
-NOTE:  After executing Step 2 you will see text from Lesson 5.3.  Then move
-       DOWN to see this lesson again.
-
-  2. Now retrieve your TEST file using the command   :r TEST   where TEST is
-     the name of the file you used.
-     The file you retrieve is placed below the cursor line.
-
-  3. To verify that a file was retrieved, cursor back and notice that there
-     are now two copies of Lesson 5.3, the original and the file version.
-
-NOTE:  You can also read the output of an external command.  For example,
-       :r !ls  reads the output of the ls command and puts it below the
-       cursor.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 5 SUMMARY
-
-
-  1.  :!command  executes an external command.
-
-      Some useful examples are:
-	 (MS-DOS)	  (Unix)
-	  :!dir		   :!ls		   -  shows a directory listing.
-	  :!del FILENAME   :!rm FILENAME   -  removes file FILENAME.
-
-  2.  :w FILENAME  writes the current Vim file to disk with name FILENAME.
-
-  3.  v  motion  :w FILENAME  saves the Visually selected lines in file
-      FILENAME.
-
-  4.  :r FILENAME  retrieves disk file FILENAME and puts it below the
-      cursor position.
-
-  5.  :r !dir  reads the output of the dir command and puts it below the
-      cursor position.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 6.1: THE OPEN COMMAND
-
-
- ** Type  o  to open a line below the cursor and place you in Insert mode. **
-
-  1. Move the cursor to the line below marked --->.
-
-  2. Type the lowercase letter  o  to open up a line BELOW the cursor and place
-     you in Insert mode.
-
-  3. Now type some text and press <ESC> to exit Insert mode.
-
----> After typing  o  the cursor is placed on the open line in Insert mode.
-
-  4. To open up a line ABOVE the cursor, simply type a capital	O , rather
-     than a lowercase  o.  Try this on the line below.
-
----> Open up a line above this by typing O while the cursor is on this line.
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 6.2: THE APPEND COMMAND
-
-
-	     ** Type  a  to insert text AFTER the cursor. **
-
-  1. Move the cursor to the start of the line below marked --->.
-  
-  2. Press  e  until the cursor is on the end of  li .
-
-  3. Type an  a  (lowercase) to append text AFTER the cursor.
-
-  4. Complete the word like the line below it.  Press <ESC> to exit Insert
-     mode.
-
-  5. Use  e  to move to the next incomplete word and repeat steps 3 and 4.
-  
----> This li will allow you to pract appendi text to a line.
----> This line will allow you to practice appending text to a line.
-
-NOTE:  a, i and A all go to the same Insert mode, the only difference is where
-       the characters are inserted.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lesson 6.3: ANOTHER WAY TO REPLACE
-
-
-      ** Type a capital  R  to replace more than one character. **
-
-  1. Move the cursor to the first line below marked --->.  Move the cursor to
-     the beginning of the first  xxx .
-
-  2. Now press  R  and type the number below it in the second line, so that it
-     replaces the xxx .
-
-  3. Press <ESC> to leave Replace mode.  Notice that the rest of the line
-     remains unmodified.
-
-  4. Repeat the steps to replace the remaining xxx.
-
----> Adding 123 to xxx gives you xxx.
----> Adding 123 to 456 gives you 579.
-
-NOTE:  Replace mode is like Insert mode, but every typed character deletes an
-       existing character.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 6.4: COPY AND PASTE TEXT
-
-
-	  ** Use the  y  operator to copy text and  p  to paste it **
-
-  1. Go to the line marked with ---> below and place the cursor after "a)".
-  
-  2. Start Visual mode with  v  and move the cursor to just before "first".
-  
-  3. Type  y  to yank (copy) the highlighted text.
-
-  4. Move the cursor to the end of the next line:  j$
-
-  5. Type  p  to put (paste) the text.  Then type:  a second <ESC> .
-
-  6. Use Visual mode to select " item.", yank it with  y , move to the end of
-     the next line with  j$  and put the text there with  p .
-
---->  a) this is the first item.
-      b)
-
-  NOTE: you can also use  y  as an operator;  yw  yanks one word.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			    Lesson 6.5: SET OPTION
-
-
-	  ** Set an option so a search or substitute ignores case **
-
-  1. Search for 'ignore' by entering:   /ignore  <ENTER>
-     Repeat several times by pressing  n .
-
-  2. Set the 'ic' (Ignore case) option by entering:   :set ic
-
-  3. Now search for 'ignore' again by pressing  n
-     Notice that Ignore and IGNORE are now also found.
-
-  4. Set the 'hlsearch' and 'incsearch' options:  :set hls is
-
-  5. Now type the search command again and see what happens:  /ignore <ENTER>
-
-  6. To disable ignoring case enter:  :set noic
-
-NOTE:  To remove the highlighting of matches enter:   :nohlsearch 
-NOTE:  If you want to ignore case for just one search command, use  \c
-       in the phrase:  /ignore\c  <ENTER>
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 6 SUMMARY
-
-  1. Type  o  to open a line BELOW the cursor and start Insert mode.
-     Type  O  to open a line ABOVE the cursor.
-
-  2. Type  a  to insert text AFTER the cursor.
-     Type  A  to insert text after the end of the line.
-
-  3. The  e  command moves to the end of a word.
-
-  4. The  y  operator yanks (copies) text,  p  puts (pastes) it.
-
-  5. Typing a capital  R  enters Replace mode until  <ESC>  is pressed.
-
-  6. Typing ":set xxx" sets the option "xxx".  Some options are:
-  	'ic' 'ignorecase'	ignore upper/lower case when searching
-	'is' 'incsearch'	show partial matches for a search phrase
-	'hls' 'hlsearch'	highlight all matching phrases
-     You can either use the long or the short option name.
-
-  7. Prepend "no" to switch an option off:   :set noic
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 7.1: GETTING HELP
-
-
-		      ** Use the on-line help system **
-
-  Vim has a comprehensive on-line help system.  To get started, try one of
-  these three:
-	- press the <HELP> key (if you have one)
-	- press the <F1> key (if you have one)
-	- type   :help <ENTER>
-
-  Read the text in the help window to find out how the help works.
-  Type  CTRL-W CTRL-W   to jump from one window to another.
-  Type    :q <ENTER>    to close the help window.
-
-  You can find help on just about any subject, by giving an argument to the
-  ":help" command.  Try these (don't forget pressing <ENTER>):
-
-	:help w
-	:help c_CTRL-D
-	:help insert-index
-	:help user-manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 7.2: CREATE A STARTUP SCRIPT
-
-
-			  ** Enable Vim features **
-
-  Vim has many more features than Vi, but most of them are disabled by
-  default.  To start using more features you have to create a "vimrc" file.
-
-  1. Start editing the "vimrc" file.  This depends on your system:
-	:e ~/.vimrc		for Unix
-	:e $VIM/_vimrc		for MS-Windows
-
-  2. Now read the example "vimrc" file contents:
-	:r $VIMRUNTIME/vimrc_example.vim
-
-  3. Write the file with:
-	:w
-
-  The next time you start Vim it will use syntax highlighting.
-  You can add all your preferred settings to this "vimrc" file.
-  For more information type  :help vimrc-intro
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			     Lesson 7.3: COMPLETION
-
-
-	      ** Command line completion with CTRL-D and <TAB> **
-
-  1. Make sure Vim is not in compatible mode:  :set nocp
-
-  2. Look what files exist in the directory:  :!ls   or  :!dir
-
-  3. Type the start of a command:  :e
-
-  4. Press  CTRL-D  and Vim will show a list of commands that start with "e".
-
-  5. Press <TAB>  and Vim will complete the command name to ":edit".
-
-  6. Now add a space and the start of an existing file name:  :edit FIL
-
-  7. Press <TAB>.  Vim will complete the name (if it is unique).
-
-NOTE:  Completion works for many commands.  Just try pressing CTRL-D and
-       <TAB>.  It is especially useful for  :help .
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 7 SUMMARY
-
-
-  1. Type  :help  or press <F1> or <Help>  to open a help window.
-
-  2. Type  :help cmd  to find help on  cmd .
-
-  3. Type  CTRL-W CTRL-W  to jump to another window
-
-  4. Type  :q  to close the help window
-
-  5. Create a vimrc startup script to keep your preferred settings.
-
-  6. When typing a  :  command, press CTRL-D to see possible completions.
-     Press <TAB> to use one completion.
-
-
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  This concludes the Vim Tutor.  It was intended to give a brief overview of
-  the Vim editor, just enough to allow you to use the editor fairly easily.
-  It is far from complete as Vim has many many more commands.  Read the user
-  manual next: ":help user-manual".
-
-  For further reading and studying, this book is recommended:
-	Vim - Vi Improved - by Steve Oualline
-	Publisher: New Riders
-  The first book completely dedicated to Vim.  Especially useful for beginners.
-  There are many examples and pictures.
-  See http://iccf-holland.org/click5.html
-
-  This book is older and more about Vi than Vim, but also recommended:
-	Learning the Vi Editor - by Linda Lamb
-	Publisher: O'Reilly & Associates Inc.
-  It is a good book to get to know almost anything you want to do with Vi.
-  The sixth edition also includes information on Vim.
-
-  This tutorial was written by Michael C. Pierce and Robert K. Ware,
-  Colorado School of Mines using ideas supplied by Charles Smith,
-  Colorado State University.  E-mail: bware@mines.colorado.edu.
-
-  Modified for Vim by Bram Moolenaar.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/vim_1_white.master
--- a/vim/notreallybundles/vimkata/vim_1_white.master	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,771 +0,0 @@
------------------------------------------------------------------------------+
-|    Vim Kata  -  White Belt (Level 1)                                        |
-+-----------------------------------------------------------------------------+
-
-Welcome, young Vim warrior.  It is an honor to meet someone such as yourself
-who seeks more than a mere grasping of a few concepts along the Vim path.  If
-you discipline your mind and dedicate yourself to the practice of Vim Kata,
-you will learn to edit text like you touch type.  You will feel the flow of
-the text in you, and around you, and by your will you will bend its shape and
-cause it to flow as you see fit.  If you continue to apply yourself and repeat
-the kata each day, then before long, you will join the few who have become
-Masters of Vim.
-
-Each practice session--called a 'kata'--should take about 20 minutes, or a
-little more if it is your first time.  When you have reduced the time to under
-5 minutes, you should move on to the next kata.
-
-You will find the answer to each question marked by a '>'.  You should be able
-to type the answer exactly and get the correct result. Each answer assumes that
-your cursor is positioned on the first character of the line below the question
-
-Tip: Press 'j' to move down.
-
-Tip: To quit this kata at any time, press <ESC>:q! and then press enter.
-Pressing <ESC>:q! will discard any changes.
-
-+-----------------------------------------------------------------------------+
-|    Ready?  Begin!                                                           |
-+-----------------------------------------------------------------------------+
-
-(1) Follow the path from 'o' to 'x':
-o-|  x-----------|
-  |-| |-| |----| |
- |--| | | |--| | |
- |----| |----| |-|
-
-
-(2) Using 'l' and 'i' keys, insert the missing text in line 1 using line 2 as a guide:
-DlbraePrate
-Deliberate Practice
-
-> lielliillielllitlli lllliclliic
-
-
-(3) Using 'h' and 'a' keys, insert the missing text in line 1 using line 2 as a guide
-Repttion s Wrtwhie
-Repetition is Worthwhile
-
-< $
-> halhhhhahhhhaohhhhaihhhhhhaihhae
-
-
-(4) Using 'A', append each parenthetical word to the end of its line:
-(not) Seek not
-(the) to follow in the
-(old;) footsteps of men of old;
-(sought.) seek what they sought.
-~ Matsu Basho
-
-> A notjA thejA old;jA sought.
-
-
-(5) Without moving the cursor, append 'ndigo' to the letter 'I':
-I will make the world beautiful.
-
-> andigo
-
-(6) Move to the beginning of each word in succession:
-Excellence is our goal; deliberate practice is what we praise.
-No life ever grows great until it is focused, dedicated and disciplined.
-
-> wwwwwwwwwwww
-
-(7) Delete the following word:
-disambiguation
-
-> dw
-
-(8) Remove the words that do not belong:
-Long trouble long ago, in a land wheel far far away...
-
-> wdwwwwwwwdw
-> wdw6wdw
-
-(9) Delete from the '|' to the end of the line:
-The weakest of all |weak things is a virtue that has not been tested in the fire.
-~ Mark Twain
-
-> wwwwD
-> wwwwd$
-> 4wD
-> f|D
-
-(10) Move to the 'd' in the word 'word':
-I encourage you to move a word at a time.
-
-> eeeeee
-> /word/e
-> 6e
-
-(11) Move to the 3rd word and then back to the beginning of the line:
-Seek not to follow in the footsteps of men of old; seek what they sought.
-~ Matsu Basho
-
-> eee0
-> 3e0
-
-(12) Delete the first 4 words:
-Never interrupt your enemy when he is making a mistake.
-~ Napoleon Bonaparte
-
-> d4w
-> 4dw
-
-(13) Move to the 3rd word and then back one word, ending at the 'f' in force:
-Who overcomes by force, hath overcome but half his foe.
-~ John Milton
-
-> wwwwb
-
-(14) Move to the 2nd word and then delete the line:
-We are what we repeatedly do. Excellence then, is not an act, but a habit.
-~ Aristotle
-
-> wdd
-> w0D
-
-(15) Delete both lines:
-I fear not the man who has practiced 10,000 kicks once,
-but I fear the man who has practiced one kick 10,000 times.
-~ Bruce Lee
-
-> d2d
-> 2dd
-
-(16) Delete the UPPER CASE words:
-Never AB CDEF interrupt your GHIJKL MNOP QRS enemy when he TUVWXYZ is making a mistake.
-~ Napoleon Bonaparte
-
-> w2dwww3dwwwwdw
-
-(17) Delete every second word, then undo all changes to the line:
-A warrior may choose pacifism; others are condemned to it.
-
-> wdwwdwwwdwwdwwdwU
-> wdww.W.w.w.U
-> qqWdwq4@qU
-
-(18) Delete the second word on each line, then undo both deletions:
-Begin at the beginning, the King said, gravely,
-and go on till you come to the end: then stop.
-~ Lewis Caroll
-
-> wdwjbdwuu
-> wdw0jwdw
-> wdw0jw.
-
-
-! KataRandom(movement-along-a-path)
-
-! KataRandom(move-and-delete)
-
-
-There are two rules for being successful in martial arts.
-Rule 1: Never tell others everything you know.
-
-The end of one kata is the beginning of another.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 3.1: THE PUT COMMAND
-
-
-       ** Type	p  to put previously deleted text after the cursor. **
-
-  1. Move the cursor to the first ---> line below.
-
-  2. Type  dd  to delete the line and store it in a Vim register.
-
-  3. Move the cursor to the c) line, ABOVE where the deleted line should go.
-
-  4. Type   p   to put the line below the cursor.
-
-  5. Repeat steps 2 through 4 to put all the lines in correct order.
-
----> d) Can you learn too?
----> b) Violets are blue,
----> c) Intelligence is learned,
----> a) Roses are red,
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 3.2: THE REPLACE COMMAND
-
-
-       ** Type  rx  to replace the character at the cursor with  x . **
-
-  1. Move the cursor to the first line below marked --->.
-
-  2. Move the cursor so that it is on top of the first error.
-
-  3. Type   r	and then the character which should be there.
-
-  4. Repeat steps 2 and 3 until the first line is equal to the second one.
-
---->  Whan this lime was tuoed in, someone presswd some wrojg keys!
---->  When this line was typed in, someone pressed some wrong keys!
-
-  5. Now move on to Lesson 3.3.
-
-NOTE: Remember that you should be learning by doing, not memorization.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 3.3: THE CHANGE OPERATOR
-
-
-	   ** To change until the end of a word, type  ce . **
-
-  1. Move the cursor to the first line below marked --->.
-
-  2. Place the cursor on the  u  in  lubw.
-
-  3. Type  ce  and the correct word (in this case, type  ine ).
-
-  4. Press <ESC> and move to the next character that needs to be changed.
-
-  5. Repeat steps 3 and 4 until the first sentence is the same as the second.
-
----> This lubw has a few wptfd that mrrf changing usf the change operator.
----> This line has a few words that need changing using the change operator.
-
-Notice that  ce  deletes the word and places you in Insert mode.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 3.4: MORE CHANGES USING c
-
-
-     ** The change operator is used with the same motions as delete. **
-
-  1. The change operator works in the same way as delete.  The format is:
-
-         c    [number]   motion
-
-  2. The motions are the same, such as   w (word) and  $ (end of line).
-
-  3. Move to the first line below marked --->.
-
-  4. Move the cursor to the first error.
-
-  5. Type  c$  and type the rest of the line like the second and press <ESC>.
-
----> The end of this line needs some help to make it like the second.
----> The end of this line needs to be corrected using the  c$  command.
-
-NOTE:  You can use the Backspace key to correct mistakes while typing.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 3 SUMMARY
-
-
-  1. To put back text that has just been deleted, type   p .  This puts the
-     deleted text AFTER the cursor (if a line was deleted it will go on the
-     line below the cursor).
-
-  2. To replace the character under the cursor, type   r   and then the
-     character you want to have there.
-
-  3. The change operator allows you to change from the cursor to where the
-     motion takes you.  eg. Type  ce  to change from the cursor to the end of
-     the word,  c$  to change to the end of a line.
-
-  4. The format for change is:
-
-	 c   [number]   motion
-
-Now go on to the next lesson.
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		  Lesson 4.1: CURSOR LOCATION AND FILE STATUS
-
-  ** Type CTRL-G to show your location in the file and the file status.
-     Type  G  to move to a line in the file. **
-
-  NOTE: Read this entire lesson before executing any of the steps!!
-
-  1. Hold down the Ctrl key and press  g .  We call this CTRL-G.
-     A message will appear at the bottom of the page with the filename and the
-     position in the file.  Remember the line number for Step 3.
-
-NOTE:  You may see the cursor position in the lower right corner of the screen
-       This happens when the 'ruler' option is set (see  :help 'ruler'  )
-
-  2. Press  G  to move you to the bottom of the file.
-     Type  gg  to move you to the start of the file.
-
-  3. Type the number of the line you were on and then  G .  This will
-     return you to the line you were on when you first pressed CTRL-G.
-
-  4. If you feel confident to do this, execute steps 1 through 3.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 4.2: THE SEARCH COMMAND
-
-
-     ** Type  /  followed by a phrase to search for the phrase. **
-
-  1. In Normal mode type the  /  character.  Notice that it and the cursor
-     appear at the bottom of the screen as with the  :	command.
-
-  2. Now type 'errroor' <ENTER>.  This is the word you want to search for.
-
-  3. To search for the same phrase again, simply type  n .
-     To search for the same phrase in the opposite direction, type  N .
-
-  4. To search for a phrase in the backward direction, use  ?  instead of  / .
-
-  5. To go back to where you came from press  CTRL-O  (Keep Ctrl down while
-     pressing the letter o).  Repeat to go back further.  CTRL-I goes forward.
-
---->  "errroor" is not the way to spell error;  errroor is an error.
-NOTE: When the search reaches the end of the file it will continue at the
-      start, unless the 'wrapscan' option has been reset.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   Lesson 4.3: MATCHING PARENTHESES SEARCH
-
-
-	      ** Type  %  to find a matching ),], or } . **
-
-  1. Place the cursor on any (, [, or { in the line below marked --->.
-
-  2. Now type the  %  character.
-
-  3. The cursor will move to the matching parenthesis or bracket.
-
-  4. Type  %  to move the cursor to the other matching bracket.
-
-  5. Move the cursor to another (,),[,],{ or } and see what  %  does.
-
----> This ( is a test line with ('s, ['s ] and {'s } in it. ))
-
-
-NOTE: This is very useful in debugging a program with unmatched parentheses!
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 4.4: THE SUBSTITUTE COMMAND
-
-
-	** Type  :s/old/new/g  to substitute 'new' for 'old'. **
-
-  1. Move the cursor to the line below marked --->.
-
-  2. Type  :s/thee/the <ENTER> .  Note that this command only changes the
-     first occurrence of "thee" in the line.
-
-  3. Now type  :s/thee/the/g .  Adding the  g  flag means to substitute
-     globally in the line, change all occurrences of "thee" in the line.
-
----> thee best time to see thee flowers is in thee spring.
-
-  4. To change every occurrence of a character string between two lines,
-     type   :#,#s/old/new/g    where #,# are the line numbers of the range
-                               of lines where the substitution is to be done.
-     Type   :%s/old/new/g      to change every occurrence in the whole file.
-     Type   :%s/old/new/gc     to find every occurrence in the whole file,
-     			       with a prompt whether to substitute or not.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 4 SUMMARY
-
-
-  1. CTRL-G  displays your location in the file and the file status.
-             G  moves to the end of the file.
-     number  G  moves to that line number.
-            gg  moves to the first line.
-
-  2. Typing  /	followed by a phrase searches FORWARD for the phrase.
-     Typing  ?	followed by a phrase searches BACKWARD for the phrase.
-     After a search type  n  to find the next occurrence in the same direction
-     or  N  to search in the opposite direction.
-     CTRL-O takes you back to older positions, CTRL-I to newer positions.
-
-  3. Typing  %	while the cursor is on a (,),[,],{, or } goes to its match.
-
-  4. To substitute new for the first old in a line type    :s/old/new
-     To substitute new for all 'old's on a line type	   :s/old/new/g
-     To substitute phrases between two line #'s type	   :#,#s/old/new/g
-     To substitute all occurrences in the file type	   :%s/old/new/g
-     To ask for confirmation each time add 'c'		   :%s/old/new/gc
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		Lesson 5.1: HOW TO EXECUTE AN EXTERNAL COMMAND
-
-
-   ** Type  :!	followed by an external command to execute that command. **
-
-  1. Type the familiar command	:  to set the cursor at the bottom of the
-     screen.  This allows you to enter a command-line command.
-
-  2. Now type the  !  (exclamation point) character.  This allows you to
-     execute any external shell command.
-
-  3. As an example type   ls   following the ! and then hit <ENTER>.  This
-     will show you a listing of your directory, just as if you were at the
-     shell prompt.  Or use  :!dir  if ls doesn't work.
-
-NOTE:  It is possible to execute any external command this way, also with
-       arguments.
-
-NOTE:  All  :  commands must be finished by hitting <ENTER>
-       From here on we will not always mention it.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 5.2: MORE ON WRITING FILES
-
-
-     ** To save the changes made to the text, type  :w FILENAME. **
-
-  1. Type  :!dir  or  :!ls  to get a listing of your directory.
-     You already know you must hit <ENTER> after this.
-
-  2. Choose a filename that does not exist yet, such as TEST.
-
-  3. Now type:	 :w TEST   (where TEST is the filename you chose.)
-
-  4. This saves the whole file (the Vim Tutor) under the name TEST.
-     To verify this, type    :!dir  or  :!ls   again to see your directory.
-
-NOTE: If you were to exit Vim and start it again with  vim TEST , the file
-      would be an exact copy of the tutor when you saved it.
-
-  5. Now remove the file by typing (MS-DOS):    :!del TEST
-				or (Unix):	:!rm TEST
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lesson 5.3: SELECTING TEXT TO WRITE
-
-
-	** To save part of the file, type  v  motion  :w FILENAME **
-
-  1. Move the cursor to this line.
-
-  2. Press  v  and move the cursor to the fifth item below.  Notice that the
-     text is highlighted.
-
-  3. Press the  :  character.  At the bottom of the screen  :'<,'> will appear.
-
-  4. Type  w TEST  , where TEST is a filename that does not exist yet.  Verify
-     that you see  :'<,'>w TEST  before you press Enter.
-
-  5. Vim will write the selected lines to the file TEST.  Use  :!dir  or  !ls
-     to see it.  Do not remove it yet!  We will use it in the next lesson.
-
-NOTE:  Pressing  v  starts Visual selection.  You can move the cursor around
-       to make the selection bigger or smaller.  Then you can use an operator
-       to do something with the text.  For example,  d  deletes the text.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		   Lesson 5.4: RETRIEVING AND MERGING FILES
-
-
-       ** To insert the contents of a file, type  :r FILENAME  **
-
-  1. Place the cursor just above this line.
-
-NOTE:  After executing Step 2 you will see text from Lesson 5.3.  Then move
-       DOWN to see this lesson again.
-
-  2. Now retrieve your TEST file using the command   :r TEST   where TEST is
-     the name of the file you used.
-     The file you retrieve is placed below the cursor line.
-
-  3. To verify that a file was retrieved, cursor back and notice that there
-     are now two copies of Lesson 5.3, the original and the file version.
-
-NOTE:  You can also read the output of an external command.  For example,
-       :r !ls  reads the output of the ls command and puts it below the
-       cursor.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 5 SUMMARY
-
-
-  1.  :!command  executes an external command.
-
-      Some useful examples are:
-	 (MS-DOS)	  (Unix)
-	  :!dir		   :!ls		   -  shows a directory listing.
-	  :!del FILENAME   :!rm FILENAME   -  removes file FILENAME.
-
-  2.  :w FILENAME  writes the current Vim file to disk with name FILENAME.
-
-  3.  v  motion  :w FILENAME  saves the Visually selected lines in file
-      FILENAME.
-
-  4.  :r FILENAME  retrieves disk file FILENAME and puts it below the
-      cursor position.
-
-  5.  :r !dir  reads the output of the dir command and puts it below the
-      cursor position.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			 Lesson 6.1: THE OPEN COMMAND
-
-
- ** Type  o  to open a line below the cursor and place you in Insert mode. **
-
-  1. Move the cursor to the line below marked --->.
-
-  2. Type the lowercase letter  o  to open up a line BELOW the cursor and place
-     you in Insert mode.
-
-  3. Now type some text and press <ESC> to exit Insert mode.
-
----> After typing  o  the cursor is placed on the open line in Insert mode.
-
-  4. To open up a line ABOVE the cursor, simply type a capital	O , rather
-     than a lowercase  o.  Try this on the line below.
-
----> Open up a line above this by typing O while the cursor is on this line.
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 6.2: THE APPEND COMMAND
-
-
-	     ** Type  a  to insert text AFTER the cursor. **
-
-  1. Move the cursor to the start of the line below marked --->.
-  
-  2. Press  e  until the cursor is on the end of  li .
-
-  3. Type an  a  (lowercase) to append text AFTER the cursor.
-
-  4. Complete the word like the line below it.  Press <ESC> to exit Insert
-     mode.
-
-  5. Use  e  to move to the next incomplete word and repeat steps 3 and 4.
-  
----> This li will allow you to pract appendi text to a line.
----> This line will allow you to practice appending text to a line.
-
-NOTE:  a, i and A all go to the same Insert mode, the only difference is where
-       the characters are inserted.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		    Lesson 6.3: ANOTHER WAY TO REPLACE
-
-
-      ** Type a capital  R  to replace more than one character. **
-
-  1. Move the cursor to the first line below marked --->.  Move the cursor to
-     the beginning of the first  xxx .
-
-  2. Now press  R  and type the number below it in the second line, so that it
-     replaces the xxx .
-
-  3. Press <ESC> to leave Replace mode.  Notice that the rest of the line
-     remains unmodified.
-
-  4. Repeat the steps to replace the remaining xxx.
-
----> Adding 123 to xxx gives you xxx.
----> Adding 123 to 456 gives you 579.
-
-NOTE:  Replace mode is like Insert mode, but every typed character deletes an
-       existing character.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			Lesson 6.4: COPY AND PASTE TEXT
-
-
-	  ** Use the  y  operator to copy text and  p  to paste it **
-
-  1. Go to the line marked with ---> below and place the cursor after "a)".
-  
-  2. Start Visual mode with  v  and move the cursor to just before "first".
-  
-  3. Type  y  to yank (copy) the highlighted text.
-
-  4. Move the cursor to the end of the next line:  j$
-
-  5. Type  p  to put (paste) the text.  Then type:  a second <ESC> .
-
-  6. Use Visual mode to select " item.", yank it with  y , move to the end of
-     the next line with  j$  and put the text there with  p .
-
---->  a) this is the first item.
-      b)
-
-  NOTE: you can also use  y  as an operator;  yw  yanks one word.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			    Lesson 6.5: SET OPTION
-
-
-	  ** Set an option so a search or substitute ignores case **
-
-  1. Search for 'ignore' by entering:   /ignore  <ENTER>
-     Repeat several times by pressing  n .
-
-  2. Set the 'ic' (Ignore case) option by entering:   :set ic
-
-  3. Now search for 'ignore' again by pressing  n
-     Notice that Ignore and IGNORE are now also found.
-
-  4. Set the 'hlsearch' and 'incsearch' options:  :set hls is
-
-  5. Now type the search command again and see what happens:  /ignore <ENTER>
-
-  6. To disable ignoring case enter:  :set noic
-
-NOTE:  To remove the highlighting of matches enter:   :nohlsearch 
-NOTE:  If you want to ignore case for just one search command, use  \c
-       in the phrase:  /ignore\c  <ENTER>
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 6 SUMMARY
-
-  1. Type  o  to open a line BELOW the cursor and start Insert mode.
-     Type  O  to open a line ABOVE the cursor.
-
-  2. Type  a  to insert text AFTER the cursor.
-     Type  A  to insert text after the end of the line.
-
-  3. The  e  command moves to the end of a word.
-
-  4. The  y  operator yanks (copies) text,  p  puts (pastes) it.
-
-  5. Typing a capital  R  enters Replace mode until  <ESC>  is pressed.
-
-  6. Typing ":set xxx" sets the option "xxx".  Some options are:
-  	'ic' 'ignorecase'	ignore upper/lower case when searching
-	'is' 'incsearch'	show partial matches for a search phrase
-	'hls' 'hlsearch'	highlight all matching phrases
-     You can either use the long or the short option name.
-
-  7. Prepend "no" to switch an option off:   :set noic
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		       Lesson 7.1: GETTING HELP
-
-
-		      ** Use the on-line help system **
-
-  Vim has a comprehensive on-line help system.  To get started, try one of
-  these three:
-	- press the <HELP> key (if you have one)
-	- press the <F1> key (if you have one)
-	- type   :help <ENTER>
-
-  Read the text in the help window to find out how the help works.
-  Type  CTRL-W CTRL-W   to jump from one window to another.
-  Type    :q <ENTER>    to close the help window.
-
-  You can find help on just about any subject, by giving an argument to the
-  ":help" command.  Try these (don't forget pressing <ENTER>):
-
-	:help w
-	:help c_CTRL-D
-	:help insert-index
-	:help user-manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-		      Lesson 7.2: CREATE A STARTUP SCRIPT
-
-
-			  ** Enable Vim features **
-
-  Vim has many more features than Vi, but most of them are disabled by
-  default.  To start using more features you have to create a "vimrc" file.
-
-  1. Start editing the "vimrc" file.  This depends on your system:
-	:e ~/.vimrc		for Unix
-	:e $VIM/_vimrc		for MS-Windows
-
-  2. Now read the example "vimrc" file contents:
-	:r $VIMRUNTIME/vimrc_example.vim
-
-  3. Write the file with:
-	:w
-
-  The next time you start Vim it will use syntax highlighting.
-  You can add all your preferred settings to this "vimrc" file.
-  For more information type  :help vimrc-intro
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			     Lesson 7.3: COMPLETION
-
-
-	      ** Command line completion with CTRL-D and <TAB> **
-
-  1. Make sure Vim is not in compatible mode:  :set nocp
-
-  2. Look what files exist in the directory:  :!ls   or  :!dir
-
-  3. Type the start of a command:  :e
-
-  4. Press  CTRL-D  and Vim will show a list of commands that start with "e".
-
-  5. Press <TAB>  and Vim will complete the command name to ":edit".
-
-  6. Now add a space and the start of an existing file name:  :edit FIL
-
-  7. Press <TAB>.  Vim will complete the name (if it is unique).
-
-NOTE:  Completion works for many commands.  Just try pressing CTRL-D and
-       <TAB>.  It is especially useful for  :help .
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-			       Lesson 7 SUMMARY
-
-
-  1. Type  :help  or press <F1> or <Help>  to open a help window.
-
-  2. Type  :help cmd  to find help on  cmd .
-
-  3. Type  CTRL-W CTRL-W  to jump to another window
-
-  4. Type  :q  to close the help window
-
-  5. Create a vimrc startup script to keep your preferred settings.
-
-  6. When typing a  :  command, press CTRL-D to see possible completions.
-     Press <TAB> to use one completion.
-
-
-
-
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-  This concludes the Vim Tutor.  It was intended to give a brief overview of
-  the Vim editor, just enough to allow you to use the editor fairly easily.
-  It is far from complete as Vim has many many more commands.  Read the user
-  manual next: ":help user-manual".
-
-  For further reading and studying, this book is recommended:
-	Vim - Vi Improved - by Steve Oualline
-	Publisher: New Riders
-  The first book completely dedicated to Vim.  Especially useful for beginners.
-  There are many examples and pictures.
-  See http://iccf-holland.org/click5.html
-
-  This book is older and more about Vi than Vim, but also recommended:
-	Learning the Vi Editor - by Linda Lamb
-	Publisher: O'Reilly & Associates Inc.
-  It is a good book to get to know almost anything you want to do with Vi.
-  The sixth edition also includes information on Vim.
-
-  This tutorial was written by Michael C. Pierce and Robert K. Ware,
-  Colorado School of Mines using ideas supplied by Charles Smith,
-  Colorado State University.  E-mail: bware@mines.colorado.edu.
-
-  Modified for Vim by Bram Moolenaar.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff -r beeff917055e -r 6bd31aa2672a vim/notreallybundles/vimkata/vim_1_white.steps
--- a/vim/notreallybundles/vimkata/vim_1_white.steps	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-[movement-along-a-path]
-(1) Follow the path from 'o' to 'x':
-o---|  |--|   |--|
-    |--|  | |-|  |
-  |-----| |-|  |-|
-  |---x |------|
-
-> lllljlllkllljjllkllkllljjhhjhhhhhhhkhhhhhhjllll
-
-(2) Follow the path from 'o' to 'x':
-o-| |-|  |--| |--|
-  |-| ||-|  | |  |
- |----||--| | |x-|
- |--------| |-|
-
-> lljllklljjhhhhhjlllllllllkhhhkllkllljjjllkkkllljjhh
-
-[move-and-delete]
-(1) Delete the .'s in the following lines:
-.*..*.***.*
-***.**.*.**
-
-> xlxxlxlllxjhhxllxlx
-
-(2) Delete the .'s in the following lines:
-***.**.*.**
-.*..*.***.*
-
-> lllxllxlxjhxhhxhxhhxlllllx
diff -r beeff917055e -r 6bd31aa2672a vim/plugin/slime.vim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vim/plugin/slime.vim	Sun Jul 11 01:35:46 2010 -0400
@@ -0,0 +1,31 @@
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+function Send_to_Screen(text)
+  if !exists("g:screen_sessionname") || !exists("g:screen_windowname")
+    call Screen_Vars()
+  end
+
+  echo system("screen -S " . g:screen_sessionname . " -p " . g:screen_windowname . " -X stuff '" . substitute(a:text, "'", "'\\\\''", 'g') . "'")
+endfunction
+
+function Screen_Session_Names(A,L,P)
+  return system("screen -ls | awk '/Attached/ {print $1}'")
+endfunction
+
+function Screen_Vars()
+  if !exists("g:screen_sessionname") || !exists("g:screen_windowname")
+    let g:screen_sessionname = ""
+    let g:screen_windowname = "0"
+  end
+
+  let g:screen_sessionname = input("session name: ", "", "custom,Screen_Session_Names")
+  let g:screen_windowname = input("window name: ", g:screen_windowname)
+endfunction
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+vmap <C-c><C-c> "ry :call Send_to_Screen(@r)<CR>
+nmap <C-c><C-c> vip<C-c><C-c>
+
+nmap <C-c>v :call Screen_Vars()<CR>
diff -r beeff917055e -r 6bd31aa2672a vim/plugin/textile.vim
--- a/vim/plugin/textile.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-" textile.vim
-"
-" Tim Harper (tim.theenchanter.com)
-
-au BufRead,BufNewFile *.textile setf textile
diff -r beeff917055e -r 6bd31aa2672a vim/syntax/kata.vim
--- a/vim/syntax/kata.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/Users/sjl/lib/dotfiles/vim/notreallybundles/vimkata/syntax/kata.vim
\ No newline at end of file
diff -r beeff917055e -r 6bd31aa2672a vim/syntax/textile.vim
--- a/vim/syntax/textile.vim	Tue Jun 29 13:45:02 2010 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-"
-"   You will have to restart vim for this to take effect.  In any case
-"   it is a good idea to read ":he new-filetype" so that you know what
-"   is going on, and why the above lines work.
-"
-"   Written originally by Dominic Mitchell, Jan 2006.
-"   happygiraffe.net
-"
-"   Modified by Aaron Bieber, May 2007.
-"   blog.aaronbieber.com
-"
-"   Modified by Tim Harper, July 2008 - current
-"   tim.theenchanter.com
-" @(#) $Id$
-
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
-    finish
-endif
-
-" Textile commands like "h1" are case sensitive, AFAIK.
-syn case match
-
-" Textile syntax: <http://textism.com/tools/textile/>
-
-" Inline elements.
-syn match txtEmphasis    /_[^_]\+_/
-syn match txtBold        /\*[^*]\+\*/
-syn match txtCite        /??.\+??/
-syn match txtDeleted     /-[^-]\+-/
-syn match txtInserted    /+[^+]\++/
-syn match txtSuper       /\^[^^]\+\^/
-syn match txtSub         /\~[^~]\+\~/
-syn match txtSpan        /%[^%]\+%/
-syn match txtFootnoteRef /\[[0-9]\+]/
-syn match txtCode        /@[^@]\+@/
-
-" Block elements.
-syn match txtHeader      /^h1\. .\+/
-syn match txtHeader2     /^h2\. .\+/
-syn match txtHeader3     /^h[3-6]\..\+/
-syn match txtBlockquote  /^bq\./
-syn match txtFootnoteDef /^fn[0-9]\+\./
-syn match txtListBullet  /\v^\*+ /
-syn match txtListBullet2  /\v^(\*\*)+ /
-syn match txtListNumber  /\v^#+ /
-syn match txtListNumber2  /\v^(##)+ /
-
-syn cluster txtBlockElement contains=txtHeader,txtBlockElement,txtFootnoteDef,txtListBullet,txtListNumber
-
-
-" Everything after the first colon is from RFC 2396, with extra
-" backslashes to keep vim happy...  Original:
-" ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?
-"
-" Revised the pattern to exclude spaces from the URL portion of the
-" pattern. Aaron Bieber, 2007.
-syn match txtLink /"[^"]\+":\(\([^:\/?# ]\+\):\)\?\(\/\/\([^\/?# ]*\)\)\?\([^?# ]*\)\(?\([^# ]*\)\)\?\(#\([^ ]*\)\)\?/
-
-syn cluster txtInlineElement contains=txtEmphasis,txtBold,txtCite,txtDeleted,txtInserted,txtSuper,txtSub,txtSpan
-
-if version >= 508 || !exists("did_txt_syn_inits")
-    if version < 508
-        let did_txt_syn_inits = 1
-        command -nargs=+ HiLink hi link <args>
-    else
-        command -nargs=+ HiLink hi def link <args>
-    endif
-
-    HiLink txtHeader Title
-    HiLink txtHeader2 Question
-    HiLink txtHeader3 Statement
-    HiLink txtBlockquote Comment
-    HiLink txtListBullet Operator
-    HiLink txtListBullet2 Constant
-    HiLink txtListNumber Operator
-    HiLink txtListNumber2 Constant
-    HiLink txtLink String
-    HiLink txtCode Identifier
-    hi def txtEmphasis term=underline cterm=underline gui=italic
-    hi def txtBold term=bold cterm=bold gui=bold
-
-    delcommand HiLink
-endif
-
-" vim: set ai et sw=4 :