add vim config files

44 files changed, 3024 insertions, 0 deletions

diff --git a/.vim/colors/desert256.vim b/.vim/colors/desert256.vim
new file mode 100644
index 0000000..7a97742
--- /dev/null
+++ b/.vim/colors/desert256.vim
@@ -0,0 +1,338 @@
+" Vim color file
+" Maintainer: Henry So, Jr. <henryso@panix.com>
+
+" These are the colors of the "desert" theme by Hans Fugal with a few small
+" modifications (namely that I lowered the intensity of the normal white and
+" made the normal and nontext backgrounds black), modified to work with 88-
+" and 256-color xterms.
+"
+" The original "desert" theme is available as part of the vim distribution or
+" at http://hans.fugal.net/vim/colors/.
+"
+" The real feature of this color scheme, with a wink to the "inkpot" theme, is
+" the programmatic approximation of the gui colors to the palettes of 88- and
+" 256- color xterms.  The functions that do this (folded away, for
+" readability) are calibrated to the colors used for Thomas E. Dickey's xterm
+" (version 200), which is available at http://dickey.his.com/xterm/xterm.html.
+"
+" I struggled with trying to parse the rgb.txt file to avoid the necessity of
+" converting color names to #rrggbb form, but decided it was just not worth
+" the effort.  Maybe someone seeing this may decide otherwise...
+
+set background=dark
+if version > 580
+    " no guarantees for version 5.8 and below, but this makes it stop
+    " complaining
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+let g:colors_name="desert256"
+
+if has("gui_running") || &t_Co == 88 || &t_Co == 256
+    " functions {{{
+    " returns an approximate grey index for the given grey level
+    fun <SID>grey_number(x)
+        if &t_Co == 88
+            if a:x < 23
+                return 0
+            elseif a:x < 69
+                return 1
+            elseif a:x < 103
+                return 2
+            elseif a:x < 127
+                return 3
+            elseif a:x < 150
+                return 4
+            elseif a:x < 173
+                return 5
+            elseif a:x < 196
+                return 6
+            elseif a:x < 219
+                return 7
+            elseif a:x < 243
+                return 8
+            else
+                return 9
+            endif
+        else
+            if a:x < 14
+                return 0
+            else
+                let l:n = (a:x - 8) / 10
+                let l:m = (a:x - 8) % 10
+                if l:m < 5
+                    return l:n
+                else
+                    return l:n + 1
+                endif
+            endif
+        endif
+    endfun
+
+    " returns the actual grey level represented by the grey index
+    fun <SID>grey_level(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 0
+            elseif a:n == 1
+                return 46
+            elseif a:n == 2
+                return 92
+            elseif a:n == 3
+                return 115
+            elseif a:n == 4
+                return 139
+            elseif a:n == 5
+                return 162
+            elseif a:n == 6
+                return 185
+            elseif a:n == 7
+                return 208
+            elseif a:n == 8
+                return 231
+            else
+                return 255
+            endif
+        else
+            if a:n == 0
+                return 0
+            else
+                return 8 + (a:n * 10)
+            endif
+        endif
+    endfun
+
+    " returns the palette index for the given grey index
+    fun <SID>grey_color(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 16
+            elseif a:n == 9
+                return 79
+            else
+                return 79 + a:n
+            endif
+        else
+            if a:n == 0
+                return 16
+            elseif a:n == 25
+                return 231
+            else
+                return 231 + a:n
+            endif
+        endif
+    endfun
+
+    " returns an approximate color index for the given color level
+    fun <SID>rgb_number(x)
+        if &t_Co == 88
+            if a:x < 69
+                return 0
+            elseif a:x < 172
+                return 1
+            elseif a:x < 230
+                return 2
+            else
+                return 3
+            endif
+        else
+            if a:x < 75
+                return 0
+            else
+                let l:n = (a:x - 55) / 40
+                let l:m = (a:x - 55) % 40
+                if l:m < 20
+                    return l:n
+                else
+                    return l:n + 1
+                endif
+            endif
+        endif
+    endfun
+
+    " returns the actual color level for the given color index
+    fun <SID>rgb_level(n)
+        if &t_Co == 88
+            if a:n == 0
+                return 0
+            elseif a:n == 1
+                return 139
+            elseif a:n == 2
+                return 205
+            else
+                return 255
+            endif
+        else
+            if a:n == 0
+                return 0
+            else
+                return 55 + (a:n * 40)
+            endif
+        endif
+    endfun
+
+    " returns the palette index for the given R/G/B color indices
+    fun <SID>rgb_color(x, y, z)
+        if &t_Co == 88
+            return 16 + (a:x * 16) + (a:y * 4) + a:z
+        else
+            return 16 + (a:x * 36) + (a:y * 6) + a:z
+        endif
+    endfun
+
+    " returns the palette index to approximate the given R/G/B color levels
+    fun <SID>color(r, g, b)
+        " get the closest grey
+        let l:gx = <SID>grey_number(a:r)
+        let l:gy = <SID>grey_number(a:g)
+        let l:gz = <SID>grey_number(a:b)
+
+        " get the closest color
+        let l:x = <SID>rgb_number(a:r)
+        let l:y = <SID>rgb_number(a:g)
+        let l:z = <SID>rgb_number(a:b)
+
+        if l:gx == l:gy && l:gy == l:gz
+            " there are two possibilities
+            let l:dgr = <SID>grey_level(l:gx) - a:r
+            let l:dgg = <SID>grey_level(l:gy) - a:g
+            let l:dgb = <SID>grey_level(l:gz) - a:b
+            let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+            let l:dr = <SID>rgb_level(l:gx) - a:r
+            let l:dg = <SID>rgb_level(l:gy) - a:g
+            let l:db = <SID>rgb_level(l:gz) - a:b
+            let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+            if l:dgrey < l:drgb
+                " use the grey
+                return <SID>grey_color(l:gx)
+            else
+                " use the color
+                return <SID>rgb_color(l:x, l:y, l:z)
+            endif
+        else
+            " only one possibility
+            return <SID>rgb_color(l:x, l:y, l:z)
+        endif
+    endfun
+
+    " returns the palette index to approximate the 'rrggbb' hex string
+    fun <SID>rgb(rgb)
+        let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+        let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+        let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+
+        return <SID>color(l:r, l:g, l:b)
+    endfun
+
+    " sets the highlighting for the given group
+    fun <SID>X(group, fg, bg, attr)
+        if a:fg != ""
+            exec "hi " . a:group . " guifg=#" . a:fg . " ctermfg=" . <SID>rgb(a:fg)
+        endif
+        if a:bg != ""
+            exec "hi " . a:group . " guibg=#" . a:bg . " ctermbg=" . <SID>rgb(a:bg)
+        endif
+        if a:attr != ""
+            exec "hi " . a:group . " gui=" . a:attr . " cterm=" . a:attr
+        endif
+    endfun
+    " }}}
+
+    call <SID>X("Normal", "cccccc", "000000", "")
+
+    " highlight groups
+    call <SID>X("Cursor", "708090", "f0e68c", "")
+    "CursorIM
+    "Directory
+    "DiffAdd
+    "DiffChange
+    "DiffDelete
+    "DiffText
+    "ErrorMsg
+    call <SID>X("VertSplit", "c2bfa5", "7f7f7f", "reverse")
+    call <SID>X("Folded", "ffd700", "4d4d4d", "")
+    call <SID>X("FoldColumn", "d2b48c", "4d4d4d", "")
+    call <SID>X("IncSearch", "708090", "f0e68c", "")
+    "LineNr
+    call <SID>X("ModeMsg", "daa520", "", "")
+    call <SID>X("MoreMsg", "2e8b57", "", "")
+    call <SID>X("NonText", "addbe7", "000000", "bold")
+    call <SID>X("Question", "00ff7f", "", "")
+    call <SID>X("Search", "f5deb3", "cd853f", "")
+    call <SID>X("SpecialKey", "9acd32", "", "")
+    call <SID>X("StatusLine", "c2bfa5", "000000", "reverse")
+    call <SID>X("StatusLineNC", "c2bfa5", "7f7f7f", "reverse")
+    call <SID>X("Title", "cd5c5c", "", "")
+    call <SID>X("Visual", "6b8e23", "f0e68c", "reverse")
+    "VisualNOS
+    call <SID>X("WarningMsg", "fa8072", "", "")
+    "WildMenu
+    "Menu
+    "Scrollbar
+    "Tooltip
+
+    " syntax highlighting groups
+    call <SID>X("Comment", "87ceeb", "", "")
+    call <SID>X("Constant", "ffa0a0", "", "")
+    call <SID>X("Identifier", "98fb98", "", "none")
+    call <SID>X("Statement", "f0e68c", "", "bold")
+    call <SID>X("PreProc", "cd5c5c", "", "")
+    call <SID>X("Type", "bdb76b", "", "bold")
+    call <SID>X("Special", "ffdead", "", "")
+    "Underlined
+    call <SID>X("Ignore", "666666", "", "")
+    "Error
+    call <SID>X("Todo", "ff4500", "eeee00", "")
+
+    " delete functions {{{
+    delf <SID>X
+    delf <SID>rgb
+    delf <SID>color
+    delf <SID>rgb_color
+    delf <SID>rgb_level
+    delf <SID>rgb_number
+    delf <SID>grey_color
+    delf <SID>grey_level
+    delf <SID>grey_number
+    " }}}
+else
+    " color terminal definitions
+    hi SpecialKey    ctermfg=darkgreen
+    hi NonText       cterm=bold ctermfg=darkblue
+    hi Directory     ctermfg=darkcyan
+    hi ErrorMsg      cterm=bold ctermfg=7 ctermbg=1
+    hi IncSearch     cterm=NONE ctermfg=yellow ctermbg=green
+    hi Search        cterm=NONE ctermfg=grey ctermbg=blue
+    hi MoreMsg       ctermfg=darkgreen
+    hi ModeMsg       cterm=NONE ctermfg=brown
+    hi LineNr        ctermfg=3
+    hi Question      ctermfg=green
+    hi StatusLine    cterm=bold,reverse
+    hi StatusLineNC  cterm=reverse
+    hi VertSplit     cterm=reverse
+    hi Title         ctermfg=5
+    hi Visual        cterm=reverse
+    hi VisualNOS     cterm=bold,underline
+    hi WarningMsg    ctermfg=1
+    hi WildMenu      ctermfg=0 ctermbg=3
+    hi Folded        ctermfg=darkgrey ctermbg=NONE
+    hi FoldColumn    ctermfg=darkgrey ctermbg=NONE
+    hi DiffAdd       ctermbg=4
+    hi DiffChange    ctermbg=5
+    hi DiffDelete    cterm=bold ctermfg=4 ctermbg=6
+    hi DiffText      cterm=bold ctermbg=1
+    hi Comment       ctermfg=darkcyan
+    hi Constant      ctermfg=brown
+    hi Special       ctermfg=5
+    hi Identifier    ctermfg=6
+    hi Statement     ctermfg=3
+    hi PreProc       ctermfg=5
+    hi Type          ctermfg=2
+    hi Underlined    cterm=underline ctermfg=5
+    hi Ignore        ctermfg=darkgrey
+    hi Error         cterm=bold ctermfg=7 ctermbg=1
+endif
+
+" vim: set fdl=0 fdm=marker:
diff --git a/.vim/colors/inkpot.vim b/.vim/colors/inkpot.vim
new file mode 100644
index 0000000..a062248
--- /dev/null
+++ b/.vim/colors/inkpot.vim
@@ -0,0 +1,212 @@
+" Vim color file
+" Name:       inkpot.vim
+" Maintainer: Ciaran McCreesh <ciaran.mccreesh@blueyonder.co.uk>
+" This should work in the GUI, rxvt-unicode (88 colour mode) and xterm (256
+" colour mode). It won't work in 8/16 colour terminals.
+"
+" To use a black background, :let g:inkpot_black_background = 1
+
+set background=dark
+hi clear
+if exists("syntax_on")
+   syntax reset
+endif
+
+let colors_name = "inkpot"
+
+" map a urxvt cube number to an xterm-256 cube number
+fun! <SID>M(a)
+    return strpart("0135", a:a, 1) + 0
+endfun
+
+" map a urxvt colour to an xterm-256 colour
+fun! <SID>X(a)
+    if &t_Co == 88
+        return a:a
+    else
+        if a:a == 8
+            return 237
+        elseif a:a < 16
+            return a:a
+        elseif a:a > 79
+            return 232 + (3 * (a:a - 80))
+        else
+            let l:b = a:a - 16
+            let l:x = l:b % 4
+            let l:y = (l:b / 4) % 4
+            let l:z = (l:b / 16)
+            return 16 + <SID>M(l:x) + (6 * <SID>M(l:y)) + (36 * <SID>M(l:z))
+        endif
+    endif
+endfun
+
+if ! exists("g:inkpot_black_background")
+    let g:inkpot_black_background = 0
+endif
+
+if has("gui_running")
+    if ! g:inkpot_black_background
+        hi Normal         gui=NONE   guifg=#cfbfad   guibg=#1e1e27
+    else
+        hi Normal         gui=NONE   guifg=#cfbfad   guibg=#000000
+    endif
+
+    hi IncSearch      gui=BOLD   guifg=#303030   guibg=#cd8b60
+    hi Search         gui=NONE   guifg=#303030   guibg=#cd8b60
+    hi ErrorMsg       gui=BOLD   guifg=#ffffff   guibg=#ce4e4e
+    hi WarningMsg     gui=BOLD   guifg=#ffffff   guibg=#ce8e4e
+    hi ModeMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
+    hi MoreMsg        gui=BOLD   guifg=#7e7eae   guibg=NONE
+    hi Question       gui=BOLD   guifg=#ffcd00   guibg=NONE
+
+    hi StatusLine     gui=BOLD   guifg=#b9b9b9   guibg=#3e3e5e
+    hi User1          gui=BOLD   guifg=#00ff8b   guibg=#3e3e5e
+    hi User2          gui=BOLD   guifg=#7070a0   guibg=#3e3e5e
+    hi StatusLineNC   gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
+    hi VertSplit      gui=NONE   guifg=#b9b9b9   guibg=#3e3e5e
+
+    hi WildMenu       gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+
+    hi MBENormal                 guifg=#cfbfad   guibg=#2e2e3f
+    hi MBEChanged                guifg=#eeeeee   guibg=#2e2e3f
+    hi MBEVisibleNormal          guifg=#cfcfcd   guibg=#4e4e8f
+    hi MBEVisibleChanged         guifg=#eeeeee   guibg=#4e4e8f
+
+    hi DiffText       gui=NONE   guifg=#ffffcd   guibg=#4a2a4a
+    hi DiffChange     gui=NONE   guifg=#ffffcd   guibg=#306b8f
+    hi DiffDelete     gui=NONE   guifg=#ffffcd   guibg=#6d3030
+    hi DiffAdd        gui=NONE   guifg=#ffffcd   guibg=#306d30
+
+    hi Cursor         gui=NONE   guifg=#404040   guibg=#8b8bff
+    hi lCursor        gui=NONE   guifg=#404040   guibg=#8fff8b
+    hi CursorIM       gui=NONE   guifg=#404040   guibg=#8b8bff
+
+    hi Folded         gui=NONE   guifg=#cfcfcd   guibg=#4b208f
+    hi FoldColumn     gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
+
+    hi Directory      gui=NONE   guifg=#00ff8b   guibg=NONE
+    hi LineNr         gui=NONE   guifg=#8b8bcd   guibg=#2e2e2e
+    hi NonText        gui=BOLD   guifg=#8b8bcd   guibg=NONE
+    hi SpecialKey     gui=BOLD   guifg=#ab60ed   guibg=NONE
+    hi Title          gui=BOLD   guifg=#af4f4b   guibg=NONE
+    hi Visual         gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
+
+    hi Comment        gui=NONE   guifg=#cd8b00   guibg=NONE
+    hi Constant       gui=NONE   guifg=#ffcd8b   guibg=NONE
+    hi String         gui=NONE   guifg=#ffcd8b   guibg=#404040
+    hi Error          gui=NONE   guifg=#ffffff   guibg=#6e2e2e
+    hi Identifier     gui=NONE   guifg=#ff8bff   guibg=NONE
+    hi Ignore         gui=NONE
+    hi Number         gui=NONE   guifg=#f0ad6d   guibg=NONE
+    hi PreProc        gui=NONE   guifg=#409090   guibg=NONE
+    hi Special        gui=NONE   guifg=#c080d0   guibg=NONE
+    hi SpecialChar    gui=NONE   guifg=#c080d0   guibg=#404040
+    hi Statement      gui=NONE   guifg=#808bed   guibg=NONE
+    hi Todo           gui=BOLD   guifg=#303030   guibg=#d0a060
+    hi Type           gui=NONE   guifg=#ff8bff   guibg=NONE
+    hi Underlined     gui=BOLD   guifg=#df9f2d   guibg=NONE
+    hi TaglistTagName gui=BOLD   guifg=#808bed   guibg=NONE
+
+    hi perlSpecialMatch   gui=NONE guifg=#c080d0   guibg=#404040
+    hi perlSpecialString  gui=NONE guifg=#c080d0   guibg=#404040
+
+    hi cSpecialCharacter  gui=NONE guifg=#c080d0   guibg=#404040
+    hi cFormat            gui=NONE guifg=#c080d0   guibg=#404040
+
+    hi doxygenBrief                 gui=NONE guifg=#fdab60   guibg=NONE
+    hi doxygenParam                 gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenPrev                  gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenSmallSpecial          gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenSpecial               gui=NONE guifg=#fdd090   guibg=NONE
+    hi doxygenComment               gui=NONE guifg=#ad7b20   guibg=NONE
+    hi doxygenSpecial               gui=NONE guifg=#fdab60   guibg=NONE
+    hi doxygenSpecialMultilineDesc  gui=NONE guifg=#ad600b   guibg=NONE
+    hi doxygenSpecialOnelineDesc    gui=NONE guifg=#ad600b   guibg=NONE
+
+    if v:version >= 700
+        hi Pmenu          gui=NONE   guifg=#eeeeee   guibg=#4e4e8f
+        hi PmenuSel       gui=BOLD   guifg=#eeeeee   guibg=#2e2e3f
+        hi PmenuSbar      gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+        hi PmenuThumb     gui=BOLD   guifg=#eeeeee   guibg=#6e6eaf
+
+        hi SpellBad     gui=undercurl guisp=#cc6666
+        hi SpellRare    gui=undercurl guisp=#cc66cc
+        hi SpellLocal   gui=undercurl guisp=#cccc66
+        hi SpellCap     gui=undercurl guisp=#66cccc
+
+        hi MatchParen   gui=NONE      guifg=#404040   guibg=#8fff8b
+    endif
+else
+    if ! g:inkpot_black_background
+        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(80)
+    else
+        exec "hi Normal         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(16)
+    endif
+
+    exec "hi IncSearch      cterm=BOLD   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
+    exec "hi Search         cterm=NONE   ctermfg=" . <SID>X(80) . " ctermbg=" . <SID>X(73)
+    exec "hi ErrorMsg       cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(48)
+    exec "hi WarningMsg     cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(68)
+    exec "hi ModeMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
+    exec "hi MoreMsg        cterm=BOLD   ctermfg=" . <SID>X(38) . " ctermbg=" . "NONE"
+    exec "hi Question       cterm=BOLD   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
+
+    exec "hi StatusLine     cterm=BOLD   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
+    exec "hi User1          cterm=BOLD   ctermfg=" . <SID>X(28) . " ctermbg=" . <SID>X(81)
+    exec "hi User2          cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(81)
+    exec "hi StatusLineNC   cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
+    exec "hi VertSplit      cterm=NONE   ctermfg=" . <SID>X(84) . " ctermbg=" . <SID>X(81)
+
+    exec "hi WildMenu       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
+
+    exec "hi MBENormal                   ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(81)
+    exec "hi MBEChanged                  ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(81)
+    exec "hi MBEVisibleNormal            ctermfg=" . <SID>X(85) . " ctermbg=" . <SID>X(82)
+    exec "hi MBEVisibleChanged           ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
+
+    exec "hi DiffText       cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(34)
+    exec "hi DiffChange     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(17)
+    exec "hi DiffDelete     cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
+    exec "hi DiffAdd        cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(20)
+
+    exec "hi Folded         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(35)
+    exec "hi FoldColumn     cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
+
+    exec "hi Directory      cterm=NONE   ctermfg=" . <SID>X(28) . " ctermbg=" . "NONE"
+    exec "hi LineNr         cterm=NONE   ctermfg=" . <SID>X(39) . " ctermbg=" . <SID>X(80)
+    exec "hi NonText        cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
+    exec "hi SpecialKey     cterm=BOLD   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
+    exec "hi Title          cterm=BOLD   ctermfg=" . <SID>X(48) . " ctermbg=" . "NONE"
+    exec "hi Visual         cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(38)
+
+    exec "hi Comment        cterm=NONE   ctermfg=" . <SID>X(52) . " ctermbg=" . "NONE"
+    exec "hi Constant       cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . "NONE"
+    exec "hi String         cterm=NONE   ctermfg=" . <SID>X(73) . " ctermbg=" . <SID>X(81)
+    exec "hi Error          cterm=NONE   ctermfg=" . <SID>X(79) . " ctermbg=" . <SID>X(32)
+    exec "hi Identifier     cterm=NONE   ctermfg=" . <SID>X(53) . " ctermbg=" . "NONE"
+    exec "hi Ignore         cterm=NONE"
+    exec "hi Number         cterm=NONE   ctermfg=" . <SID>X(69) . " ctermbg=" . "NONE"
+    exec "hi PreProc        cterm=NONE   ctermfg=" . <SID>X(25) . " ctermbg=" . "NONE"
+    exec "hi Special        cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . "NONE"
+    exec "hi SpecialChar    cterm=NONE   ctermfg=" . <SID>X(55) . " ctermbg=" . <SID>X(81)
+    exec "hi Statement      cterm=NONE   ctermfg=" . <SID>X(27) . " ctermbg=" . "NONE"
+    exec "hi Todo           cterm=BOLD   ctermfg=" . <SID>X(16) . " ctermbg=" . <SID>X(57)
+    exec "hi Type           cterm=NONE   ctermfg=" . <SID>X(71) . " ctermbg=" . "NONE"
+    exec "hi Underlined     cterm=BOLD   ctermfg=" . <SID>X(77) . " ctermbg=" . "NONE"
+    exec "hi TaglistTagName cterm=BOLD   ctermfg=" . <SID>X(39) . " ctermbg=" . "NONE"
+
+    if v:version >= 700
+        exec "hi Pmenu          cterm=NONE   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(82)
+        exec "hi PmenuSel       cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(38)
+        exec "hi PmenuSbar      cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
+        exec "hi PmenuThumb     cterm=BOLD   ctermfg=" . <SID>X(87) . " ctermbg=" . <SID>X(39)
+
+        exec "hi SpellBad       cterm=NONE ctermbg=" . <SID>X(32)
+        exec "hi SpellRare      cterm=NONE ctermbg=" . <SID>X(33)
+        exec "hi SpellLocal     cterm=NONE ctermbg=" . <SID>X(36)
+        exec "hi SpellCap       cterm=NONE ctermbg=" . <SID>X(21)
+        exec "hi MatchParen     cterm=NONE ctermbg=" . <SID>X(14) . "ctermfg=" . <SID>X(25)
+    endif
+endif
+
+" vim: set et :
diff --git a/.vim/compiler/mlint.vim b/.vim/compiler/mlint.vim
new file mode 100644
index 0000000..f9e9c6d
--- /dev/null
+++ b/.vim/compiler/mlint.vim
@@ -0,0 +1,44 @@
+" Vim compiler file
+" Compiler:         Matlab mlint code checker
+" Maintainer:       Fabrice Guy <fabrice.guy at gmail dot com>
+" Latest Revision:  2008 Oct 16
+" Comment:          mlint messages are either 
+"                   - L x (C y): message (where x and y are line number and
+"                   column number)
+"                   - L x (C y-z): message (where x is the line number, y and
+"                   z the column numbers where the error comes from)
+
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "mlint"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" mlint doesn't provide filename information except if multiple
+" filenames are given 
+" With the following command :
+" mlint <filename> <filename without extension>
+" mlint produces an output like that :
+" ========== <filename> ==========
+" L x (C y): ID : Message
+" L x (C y): ID : Message
+" ..
+" ..
+" ========== <filename without extension> ==========
+" L 0 (C 0): MDOTM :Filename 'filename' must end in .m or .M
+"
+" The filename can then be parsed
+CompilerSet makeprg=mlint\ -id\ %\ %< 
+
+CompilerSet errorformat=
+      \%-P==========\ %f\ ==========,
+      \%-G%>==========\ %s\ ==========,
+      \%-G%>L\ %l\ (C\ %c):\ MDOTM%m,
+      \L\ %l\ (C\ %c):\ %m,
+      \L\ %l\ (C\ %c-%*[0-9]):\ %m,
+      \%-Q
+
diff --git a/.vim/ftplugin/matlab.vim b/.vim/ftplugin/matlab.vim
new file mode 100644
index 0000000..4ae257f
--- /dev/null
+++ b/.vim/ftplugin/matlab.vim
@@ -0,0 +1,31 @@
+" Vim filetype plugin file
+" Language:	matlab
+" Maintainer:	Fabrice Guy <fabrice.guy at gmail dot com>
+" Last Changed: 2008 Oct 16
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+if exists("loaded_matchit")
+  let s:conditionalEnd = '\(([^()]*\)\@!\<end\>\([^()]*)\)\@!'
+  let b:match_words = '\<classdef\>\|\<methods\>\|\<events\>\|\<properties\>\|\<if\>\|\<while\>\|\<for\>\|\<switch\>\|\<try\>\|\<function\>:' . s:conditionalEnd
+endif
+
+setlocal suffixesadd=.m
+setlocal suffixes+=.asv
+" Change the :browse e filter to primarily show M-files
+if has("gui_win32") && !exists("b:browsefilter")
+  let  b:browsefilter="M-files (*.m)\t*.m\n" .
+	\ "All files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setlocal suffixesadd< suffixes< "
+      \ . "| unlet! b:browsefilter"
+      \ . "| unlet! b:match_words"
+
+let &cpo = s:save_cpo
diff --git a/.vim/indent/matlab.vim b/.vim/indent/matlab.vim
new file mode 100644
index 0000000..936ac7c
--- /dev/null
+++ b/.vim/indent/matlab.vim
@@ -0,0 +1,136 @@
+" Matlab indent file
+" Language:	Matlab
+" Maintainer:	Fabrice Guy <fabrice.guy at gmail dot com>
+" Last Change:	2008 Oct 15 
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+let s:onlySubfunctionExists = 0
+
+setlocal indentexpr=GetMatlabIndent()
+setlocal indentkeys=!,o,O=end,=case,=else,=elseif,=otherwise,=catch
+
+" Only define the function once.
+if exists("*GetMatlabIndent")
+  finish
+endif
+
+function! s:IsMatlabContinuationLine(lnum)
+  let continuationLine = 0
+  if a:lnum > 0
+    let pnbline = getline(prevnonblank(a:lnum))
+    " if we have the line continuation operator (... at the end of a line or
+    " ... followed by a comment) it may be a line continuation
+    if pnbline =~ '\.\.\.\s*$' || pnbline =~ '\.\.\.\s*%.*$'
+      let continuationLine = 1
+      " but if the ... are part of a string or a comment, it is not a
+      " continuation line
+      let col = match(pnbline, '\.\.\.\s*$')
+      if col == -1
+	let col = match(pnbline, '\.\.\.\s*%.*$')
+      endif
+      if has('syntax_items')
+	if synIDattr(synID(prevnonblank(a:lnum), col + 1, 1), "name") =~ "matlabString" ||
+	      \ synIDattr(synID(prevnonblank(a:lnum), col + 1, 1), "name") =~ "matlabComment" 
+	  let continuationLine = 0
+	endif
+      endif
+    endif
+  endif
+  return continuationLine
+endfunction
+
+function GetMatlabIndent()
+  " Find a non-blank line above the current line.
+  let plnum = prevnonblank(v:lnum - 1)
+
+  " If the previous line is a continuation line, get the beginning of the block to 
+  " use the indent of that line
+  if s:IsMatlabContinuationLine(plnum - 1)
+    while s:IsMatlabContinuationLine(plnum - 1)
+      let plnum = plnum - 1
+    endwhile
+  endif
+
+  " At the start of the file use zero indent.
+  if plnum == 0
+    return 0
+  endif
+
+  let curind = indent(plnum)
+  if s:IsMatlabContinuationLine(v:lnum - 1) 
+    let curind = curind + &sw
+  endif
+  " Add a 'shiftwidth' after classdef, properties, switch, methods, events,
+  " function, if, while, for, otherwise, case, tic, try, catch, else, elseif
+  if getline(plnum) =~ '^\s*\(classdef\|properties\|switch\|methods\|events\|function\|if\|while\|for\|otherwise\|case\|tic\|try\|catch\|else\|elseif\)\>'
+    let curind = curind + &sw
+    " In Matlab we have different kind of functions
+    " - the main function (the function with the same name than the filename)
+    " - the nested functions
+    " - the functions defined in methods (for classes)
+    " - subfunctions
+    " For the moment the main function (located line 1) doesn't produce any indentation in the
+    " code (default behavior in the Matlab editor) and the other kind of
+    " functions indent the code
+    if getline(plnum)  =~ '^\s*\function\>'
+      " If it is the main function
+      if plnum == 1
+	" look for a matching end : 
+	" - if we find a matching end everything is fine
+	" - if not, then all other functions are subfunctions
+	normal %
+	if getline(line('.')) =~ '^\s*end'
+	  let s:onlySubfunctionExists = 0
+	else
+	  let s:onlySubfunctionExists = 1
+	endif
+	normal %
+	let curind = curind - &sw
+      else
+	" it is a subfunction without matching end : dedent
+	if s:onlySubfunctionExists
+	  let curind = curind - &sw
+	endif
+      endif
+    endif
+  endif
+
+  " Subtract a 'shiftwidth' on a else, elseif, end, catch, otherwise, case,
+  " toc
+  if getline(v:lnum) =~ '^\s*\(else\|elseif\|end\|catch\|otherwise\|case\|toc\)\>'
+    let curind = curind - &sw
+  endif
+  " No indentation in a subfunction
+  if getline(v:lnum)  =~ '^\s*\function\>' && s:onlySubfunctionExists
+    let curind = curind - &sw
+  endif
+
+  " First case after a switch : indent
+  if getline(v:lnum) =~ '^\s*case'
+    while plnum > 0 && (getline(plnum) =~ '^\s*%' || getline(plnum) =~ '^\s*$')
+      let plnum = plnum - 1
+    endwhile
+    if getline(plnum) =~ '^\s*switch'
+      let curind = indent(plnum) + &sw
+    endif
+  endif
+
+  " end in a switch / end block : dedent twice
+  " we use the matchit script to know if this end is the end of a switch block
+  if exists("b:match_words")
+    if getline(v:lnum) =~ '^\s*end'
+      normal %
+      if getline(line('.')) =~ "switch"
+	let curind = curind - &sw
+      endif
+      normal %
+    end
+  end
+  return curind
+endfunction
+
+" vim:sw=2
diff --git a/.vim/plugin/imaps.vim b/.vim/plugin/imaps.vim
new file mode 100644
index 0000000..9738936
--- /dev/null
+++ b/.vim/plugin/imaps.vim
@@ -0,0 +1,822 @@
+"        File: imaps.vim
+"     Authors: Srinath Avadhanula <srinath AT fastmail.fm>
+"              Benji Fisher <benji AT member.AMS.org>
+"              
+"         WWW: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/vim-latex/vimfiles/plugin/imaps.vim?only_with_tag=MAIN
+"
+" Description: insert mode template expander with cursor placement
+"              while preserving filetype indentation.
+"
+"     $Id: imaps.vim,v 1.39 2004/05/30 07:35:40 srinathava Exp $
+"
+" Documentation: {{{
+"
+" Motivation:
+" this script provides a way to generate insert mode mappings which do not
+" suffer from some of the problem of mappings and abbreviations while allowing
+" cursor placement after the expansion. It can alternatively be thought of as
+" a template expander. 
+"
+" Consider an example. If you do
+"
+" imap lhs something
+"
+" then a mapping is set up. However, there will be the following problems:
+" 1. the 'ttimeout' option will generally limit how easily you can type the
+"    lhs. if you type the left hand side too slowly, then the mapping will not
+"    be activated.
+" 2. if you mistype one of the letters of the lhs, then the mapping is
+"    deactivated as soon as you backspace to correct the mistake.
+"
+" If, in order to take care of the above problems, you do instead
+"
+" iab lhs something
+"
+" then the timeout problem is solved and so is the problem of mistyping.
+" however, abbreviations are only expanded after typing a non-word character.
+" which causes problems of cursor placement after the expansion and invariably
+" spurious spaces are inserted.
+" 
+" Usage Example:
+" this script attempts to solve all these problems by providing an emulation
+" of imaps wchich does not suffer from its attendant problems. Because maps
+" are activated without having to press additional characters, therefore
+" cursor placement is possible. furthermore, file-type specific indentation is
+" preserved, because the rhs is expanded as if the rhs is typed in literally
+" by the user.
+"  
+" The script already provides some default mappings. each "mapping" is of the
+" form:
+"
+" call IMAP (lhs, rhs, ft)
+" 
+" Some characters in the RHS have special meaning which help in cursor
+" placement.
+"
+" Example One:
+"
+" 	call IMAP ("bit`", "\\begin{itemize}\<cr>\\item <++>\<cr>\\end{itemize}<++>", "tex")
+" 
+" This effectively sets up the map for "bit`" whenever you edit a latex file.
+" When you type in this sequence of letters, the following text is inserted:
+" 
+" \begin{itemize}
+" \item *
+" \end{itemize}<++>
+"
+" where * shows the cursor position. The cursor position after inserting the
+" text is decided by the position of the first "place-holder". Place holders
+" are special characters which decide cursor placement and movement. In the
+" example above, the place holder characters are <+ and +>. After you have typed
+" in the item, press <C-j> and you will be taken to the next set of <++>'s.
+" Therefore by placing the <++> characters appropriately, you can minimize the
+" use of movement keys.
+"
+" NOTE: Set g:Imap_UsePlaceHolders to 0 to disable placeholders altogether.
+" Set 
+" 	g:Imap_PlaceHolderStart and g:Imap_PlaceHolderEnd
+" to something else if you want different place holder characters.
+" Also, b:Imap_PlaceHolderStart and b:Imap_PlaceHolderEnd override the values
+" of g:Imap_PlaceHolderStart and g:Imap_PlaceHolderEnd respectively. This is
+" useful for setting buffer specific place hoders.
+" 
+" Example Two:
+" You can use the <C-r> command to insert dynamic elements such as dates.
+"	call IMAP ('date`', "\<c-r>=strftime('%b %d %Y')\<cr>", '')
+"
+" sets up the map for date` to insert the current date.
+"
+"--------------------------------------%<--------------------------------------
+" Bonus: This script also provides a command Snip which puts tearoff strings,
+" '----%<----' above and below the visually selected range of lines. The
+" length of the string is chosen to be equal to the longest line in the range.
+" Recommended Usage:
+"   '<,'>Snip
+"--------------------------------------%<--------------------------------------
+" }}}
+
+" ==============================================================================
+" Script Options / Variables
+" ============================================================================== 
+" Options {{{
+if !exists('g:Imap_StickyPlaceHolders')
+	let g:Imap_StickyPlaceHolders = 1
+endif
+if !exists('g:Imap_DeleteEmptyPlaceHolders')
+	let g:Imap_DeleteEmptyPlaceHolders = 1
+endif
+" }}}
+" Variables {{{
+" s:LHS_{ft}_{char} will be generated automatically.  It will look like
+" s:LHS_tex_o = 'fo\|foo\|boo' and contain all mapped sequences ending in "o".
+" s:Map_{ft}_{lhs} will be generated automatically.  It will look like
+" s:Map_c_foo = 'for(<++>; <++>; <++>)', the mapping for "foo".
+"
+" }}}
+
+" ==============================================================================
+" functions for easy insert mode mappings.
+" ==============================================================================
+" IMAP: Adds a "fake" insert mode mapping. {{{
+"       For example, doing
+"           IMAP('abc', 'def' ft) 
+"       will mean that if the letters abc are pressed in insert mode, then
+"       they will be replaced by def. If ft != '', then the "mapping" will be
+"       specific to the files of type ft. 
+"
+"       Using IMAP has a few advantages over simply doing:
+"           imap abc def
+"       1. with imap, if you begin typing abc, the cursor will not advance and
+"          long as there is a possible completion, the letters a, b, c will be
+"          displayed on on top of the other. using this function avoids that.
+"       2. with imap, if a backspace or arrow key is pressed before completing
+"          the word, then the mapping is lost. this function allows movement. 
+"          (this ofcourse means that this function is only limited to
+"          left-hand-sides which do not have movement keys or unprintable
+"          characters)
+"       It works by only mapping the last character of the left-hand side.
+"       when this character is typed in, then a reverse lookup is done and if
+"       the previous characters consititute the left hand side of the mapping,
+"       the previously typed characters and erased and the right hand side is
+"       inserted
+
+" IMAP: set up a filetype specific mapping.
+" Description:
+"   "maps" the lhs to rhs in files of type 'ft'. If supplied with 2
+"   additional arguments, then those are assumed to be the placeholder
+"   characters in rhs. If unspecified, then the placeholder characters
+"   are assumed to be '<+' and '+>' These placeholder characters in
+"   a:rhs are replaced with the users setting of
+"   [bg]:Imap_PlaceHolderStart and [bg]:Imap_PlaceHolderEnd settings.
+"
+function! IMAP(lhs, rhs, ft, ...)
+
+	" Find the place holders to save for IMAP_PutTextWithMovement() .
+	if a:0 < 2
+		let phs = '<+'
+		let phe = '+>'
+	else
+		let phs = a:1
+		let phe = a:2
+	endif
+
+	let hash = s:Hash(a:lhs)
+	let s:Map_{a:ft}_{hash} = a:rhs
+	let s:phs_{a:ft}_{hash} = phs
+	let s:phe_{a:ft}_{hash} = phe
+
+	" Add a:lhs to the list of left-hand sides that end with lastLHSChar:
+	let lastLHSChar = a:lhs[strlen(a:lhs)-1]
+	let hash = s:Hash(lastLHSChar)
+	if !exists("s:LHS_" . a:ft . "_" . hash)
+		let s:LHS_{a:ft}_{hash} = escape(a:lhs, '\')
+	else
+		let s:LHS_{a:ft}_{hash} = escape(a:lhs, '\') .'\|'.  s:LHS_{a:ft}_{hash}
+	endif
+
+	" map only the last character of the left-hand side.
+	if lastLHSChar == ' '
+		let lastLHSChar = '<space>'
+	end
+	exe 'inoremap <silent>'
+				\ escape(lastLHSChar, '|')
+				\ '<C-r>=<SID>LookupCharacter("' .
+				\ escape(lastLHSChar, '\|"') .
+				\ '")<CR>'
+endfunction
+
+" }}}
+" IMAP_list:  list the rhs and place holders corresponding to a:lhs {{{
+"
+" Added mainly for debugging purposes, but maybe worth keeping.
+function! IMAP_list(lhs)
+	let char = a:lhs[strlen(a:lhs)-1]
+	let charHash = s:Hash(char)
+	if exists("s:LHS_" . &ft ."_". charHash) && a:lhs =~ s:LHS_{&ft}_{charHash}
+		let ft = &ft
+	elseif exists("s:LHS__" . charHash) && a:lhs =~ s:LHS__{charHash}
+		let ft = ""
+	else
+		return ""
+	endif
+	let hash = s:Hash(a:lhs)
+	return "rhs = " . s:Map_{ft}_{hash} . " place holders = " .
+				\ s:phs_{ft}_{hash} . " and " . s:phe_{ft}_{hash}
+endfunction
+" }}}
+" LookupCharacter: inserts mapping corresponding to this character {{{
+"
+" This function extracts from s:LHS_{&ft}_{a:char} or s:LHS__{a:char}
+" the longest lhs matching the current text.  Then it replaces lhs with the
+" corresponding rhs saved in s:Map_{ft}_{lhs} .
+" The place-holder variables are passed to IMAP_PutTextWithMovement() .
+function! s:LookupCharacter(char)
+	if IMAP_GetVal('Imap_FreezeImap', 0) == 1
+		return a:char
+	endif
+	let charHash = s:Hash(a:char)
+
+	" The line so far, including the character that triggered this function:
+	let text = strpart(getline("."), 0, col(".")-1) . a:char
+	" Prefer a local map to a global one, even if the local map is shorter.
+	" Is this what we want?  Do we care?
+	" Use '\V' (very no-magic) so that only '\' is special, and it was already
+	" escaped when building up s:LHS_{&ft}_{charHash} .
+	if exists("s:LHS_" . &ft . "_" . charHash)
+				\ && text =~ "\\C\\V\\(" . s:LHS_{&ft}_{charHash} . "\\)\\$"
+		let ft = &ft
+	elseif exists("s:LHS__" . charHash)
+				\ && text =~ "\\C\\V\\(" . s:LHS__{charHash} . "\\)\\$"
+		let ft = ""
+	else
+		" If this is a character which could have been used to trigger an
+		" abbreviation, check if an abbreviation exists.
+		if a:char !~ '\k'
+			let lastword = matchstr(getline('.'), '\k\+$', '')
+			if lastword != ''
+				" An extremeley wierd way to get around the fact that vim
+				" doesn't have the equivalent of the :mapcheck() function for
+				" abbreviations.
+				let _a = @a
+				exec "redir @a | silent! iab ".lastword." | redir END"
+				let abbreviationRHS = matchstr(@a."\n", "\n".'i\s\+'.lastword.'\+\s\+@\?\zs.*\ze'."\n")
+
+				if @a =~ "No abbreviation found" || abbreviationRHS == ""
+					let @a = _a
+					return a:char
+				endif
+
+				let @a = _a
+				let abbreviationRHS = escape(abbreviationRHS, '\<"')
+				exec 'let abbreviationRHS = "'.abbreviationRHS.'"'
+
+				let lhs = lastword.a:char
+				let rhs = abbreviationRHS.a:char
+				let phs = IMAP_GetPlaceHolderStart()
+				let phe = IMAP_GetPlaceHolderEnd()
+			else
+				return a:char
+			endif
+		else
+			return a:char
+		endif
+	endif
+	" Find the longest left-hand side that matches the line so far.
+	" matchstr() returns the match that starts first. This automatically
+	" ensures that the longest LHS is used for the mapping.
+	if !exists('lhs') || !exists('rhs')
+		let lhs = matchstr(text, "\\C\\V\\(" . s:LHS_{ft}_{charHash} . "\\)\\$")
+		let hash = s:Hash(lhs)
+		let rhs = s:Map_{ft}_{hash}
+		let phs = s:phs_{ft}_{hash} 
+		let phe = s:phe_{ft}_{hash}
+	endif
+
+	if strlen(lhs) == 0
+		return a:char
+	endif
+	" enough back-spaces to erase the left-hand side; -1 for the last
+	" character typed:
+	let bs = substitute(strpart(lhs, 1), ".", "\<bs>", "g")
+	return bs . IMAP_PutTextWithMovement(rhs, phs, phe)
+endfunction
+
+" }}}
+" IMAP_PutTextWithMovement: returns the string with movement appended {{{
+" Description:
+"   If a:str contains "placeholders", then appends movement commands to
+"   str in a way that the user moves to the first placeholder and enters
+"   insert or select mode. If supplied with 2 additional arguments, then
+"   they are assumed to be the placeholder specs. Otherwise, they are
+"   assumed to be '<+' and '+>'. These placeholder chars are replaced
+"   with the users settings of [bg]:Imap_PlaceHolderStart and
+"   [bg]:Imap_PlaceHolderEnd.
+function! IMAP_PutTextWithMovement(str, ...)
+
+	" The placeholders used in the particular input string. These can be
+	" different from what the user wants to use.
+	if a:0 < 2
+		let phs = '<+'
+		let phe = '+>'
+	else
+		let phs = escape(a:1, '\')
+		let phe = escape(a:2, '\')
+	endif
+
+	let text = a:str
+
+	" The user's placeholder settings.
+	let phsUser = IMAP_GetPlaceHolderStart()
+	let pheUser = IMAP_GetPlaceHolderEnd()
+
+	" Problem:  depending on the setting of the 'encoding' option, a character
+	" such as "\xab" may not match itself.  We try to get around this by
+	" changing the encoding of all our strings.  At the end, we have to
+	" convert text back.
+	let phsEnc     = s:Iconv(phs, "encode")
+	let pheEnc     = s:Iconv(phe, "encode")
+	let phsUserEnc = s:Iconv(phsUser, "encode")
+	let pheUserEnc = s:Iconv(pheUser, "encode")
+	let textEnc    = s:Iconv(text, "encode")
+	if textEnc != text
+		let textEncoded = 1
+	else
+		let textEncoded = 0
+	endif
+
+	let pattern = '\V\(\.\{-}\)' .phs. '\(\.\{-}\)' .phe. '\(\.\*\)'
+	" If there are no placeholders, just return the text.
+	if textEnc !~ pattern
+		call IMAP_Debug('Not getting '.phs.' and '.phe.' in '.textEnc, 'imap')
+		return text
+	endif
+	" Break text up into "initial <+template+> final"; any piece may be empty.
+	let initialEnc  = substitute(textEnc, pattern, '\1', '')
+	let templateEnc = substitute(textEnc, pattern, '\2', '')
+	let finalEnc    = substitute(textEnc, pattern, '\3', '')
+
+	" If the user does not want to use placeholders, then remove all but the
+	" first placeholder.
+	" Otherwise, replace all occurences of the placeholders here with the
+	" user's choice of placeholder settings.
+	if exists('g:Imap_UsePlaceHolders') && !g:Imap_UsePlaceHolders
+		let finalEnc = substitute(finalEnc, '\V'.phs.'\.\{-}'.phe, '', 'g')
+	else
+		let finalEnc = substitute(finalEnc, '\V'.phs.'\(\.\{-}\)'.phe,
+					\ phsUserEnc.'\1'.pheUserEnc, 'g')
+	endif
+
+	" The substitutions are done, so convert back, if necessary.
+	if textEncoded
+		let initial = s:Iconv(initialEnc, "decode")
+		let template = s:Iconv(templateEnc, "decode")
+		let final = s:Iconv(finalEnc, "decode")
+	else
+		let initial = initialEnc
+		let template = templateEnc
+		let final = finalEnc
+	endif
+
+	" Build up the text to insert:
+	" 1. the initial text plus an extra character;
+	" 2. go to Normal mode with <C-\><C-N>, so it works even if 'insertmode'
+	" is set, and mark the position;
+	" 3. replace the extra character with tamplate and final;
+	" 4. back to Normal mode and restore the cursor position;
+	" 5. call IMAP_Jumpfunc().
+	let template = phsUser . template . pheUser
+	" Old trick:  insert and delete a character to get the same behavior at
+	" start, middle, or end of line and on empty lines.
+	let text = initial . "X\<C-\>\<C-N>:call IMAP_Mark('set')\<CR>\"_s"
+	let text = text . template . final
+	let text = text . "\<C-\>\<C-N>:call IMAP_Mark('go')\<CR>"
+	let text = text . "i\<C-r>=IMAP_Jumpfunc('', 1)\<CR>"
+
+	call IMAP_Debug('IMAP_PutTextWithMovement: text = ['.text.']', 'imap')
+	return text
+endfunction
+
+" }}}
+" IMAP_Jumpfunc: takes user to next <+place-holder+> {{{
+" Author: Luc Hermitte
+" Arguments:
+" direction: flag for the search() function. If set to '', search forwards,
+"            if 'b', then search backwards. See the {flags} argument of the
+"            |search()| function for valid values.
+" inclusive: In vim, the search() function is 'exclusive', i.e we always goto
+"            next cursor match even if there is a match starting from the
+"            current cursor position. Setting this argument to 1 makes
+"            IMAP_Jumpfunc() also respect a match at the current cursor
+"            position. 'inclusive'ness is necessary for IMAP() because a
+"            placeholder string can occur at the very beginning of a map which
+"            we want to select.
+"            We use a non-zero value only in special conditions. Most mappings
+"            should use a zero value.
+function! IMAP_Jumpfunc(direction, inclusive)
+
+	" The user's placeholder settings.
+	let phsUser = IMAP_GetPlaceHolderStart()
+	let pheUser = IMAP_GetPlaceHolderEnd()
+
+	let searchString = ''
+	" If this is not an inclusive search or if it is inclusive, but the
+	" current cursor position does not contain a placeholder character, then
+	" search for the placeholder characters.
+	if !a:inclusive || strpart(getline('.'), col('.')-1) !~ '\V\^'.phsUser
+		let searchString = '\V'.phsUser.'\_.\{-}'.pheUser
+	endif
+
+	" If we didn't find any placeholders return quietly.
+	if searchString != '' && !search(searchString, a:direction)
+		return ''
+	endif
+
+	" Open any closed folds and make this part of the text visible.
+	silent! foldopen!
+
+	" Calculate if we have an empty placeholder or if it contains some
+	" description.
+	let template = 
+		\ matchstr(strpart(getline('.'), col('.')-1),
+		\          '\V\^'.phsUser.'\zs\.\{-}\ze\('.pheUser.'\|\$\)')
+	let placeHolderEmpty = !strlen(template)
+
+	" If we are selecting in exclusive mode, then we need to move one step to
+	" the right
+	let extramove = ''
+	if &selection == 'exclusive'
+		let extramove = 'l'
+	endif
+
+	" Select till the end placeholder character.
+	let movement = "\<C-o>v/\\V".pheUser."/e\<CR>".extramove
+
+	" First remember what the search pattern was. s:RemoveLastHistoryItem will
+	" reset @/ to this pattern so we do not create new highlighting.
+	let g:Tex_LastSearchPattern = @/
+
+	" Now either goto insert mode or select mode.
+	if placeHolderEmpty && g:Imap_DeleteEmptyPlaceHolders
+		" delete the empty placeholder into the blackhole.
+		return movement."\"_c\<C-o>:".s:RemoveLastHistoryItem."\<CR>"
+	else
+		return movement."\<C-\>\<C-N>:".s:RemoveLastHistoryItem."\<CR>gv\<C-g>"
+	endif
+	
+endfunction
+
+" }}}
+" Maps for IMAP_Jumpfunc {{{
+"
+" These mappings use <Plug> and thus provide for easy user customization. When
+" the user wants to map some other key to jump forward, he can do for
+" instance:
+"   nmap ,f   <plug>IMAP_JumpForward
+" etc.
+
+" jumping forward and back in insert mode.
+imap <silent> <Plug>IMAP_JumpForward    <c-r>=IMAP_Jumpfunc('', 0)<CR>
+imap <silent> <Plug>IMAP_JumpBack       <c-r>=IMAP_Jumpfunc('b', 0)<CR>
+
+" jumping in normal mode
+nmap <silent> <Plug>IMAP_JumpForward        i<c-r>=IMAP_Jumpfunc('', 0)<CR>
+nmap <silent> <Plug>IMAP_JumpBack           i<c-r>=IMAP_Jumpfunc('b', 0)<CR>
+
+" deleting the present selection and then jumping forward.
+vmap <silent> <Plug>IMAP_DeleteAndJumpForward       "_<Del>i<c-r>=IMAP_Jumpfunc('', 0)<CR>
+vmap <silent> <Plug>IMAP_DeleteAndJumpBack          "_<Del>i<c-r>=IMAP_Jumpfunc('b', 0)<CR>
+
+" jumping forward without deleting present selection.
+vmap <silent> <Plug>IMAP_JumpForward       <C-\><C-N>i<c-r>=IMAP_Jumpfunc('', 0)<CR>
+vmap <silent> <Plug>IMAP_JumpBack          <C-\><C-N>`<i<c-r>=IMAP_Jumpfunc('b', 0)<CR>
+
+" }}}
+" Default maps for IMAP_Jumpfunc {{{
+" map only if there is no mapping already. allows for user customization.
+" NOTE: Default mappings for jumping to the previous placeholder are not
+"       provided. It is assumed that if the user will create such mappings
+"       hself if e so desires.
+if !hasmapto('<Plug>IMAP_JumpForward', 'i')
+    imap <C-J> <Plug>IMAP_JumpForward
+endif
+if !hasmapto('<Plug>IMAP_JumpForward', 'n')
+    nmap <C-J> <Plug>IMAP_JumpForward
+endif
+if exists('g:Imap_StickyPlaceHolders') && g:Imap_StickyPlaceHolders
+	if !hasmapto('<Plug>IMAP_JumpForward', 'v')
+		vmap <C-J> <Plug>IMAP_JumpForward
+	endif
+else
+	if !hasmapto('<Plug>IMAP_DeleteAndJumpForward', 'v')
+		vmap <C-J> <Plug>IMAP_DeleteAndJumpForward
+	endif
+endif
+" }}}
+
+nmap <silent> <script> <plug><+SelectRegion+> `<v`>
+
+" ============================================================================== 
+" enclosing selected region.
+" ============================================================================== 
+" VEnclose: encloses the visually selected region with given arguments {{{
+" Description: allows for differing action based on visual line wise
+"              selection or visual characterwise selection. preserves the
+"              marks and search history.
+function! VEnclose(vstart, vend, VStart, VEnd)
+
+	" its characterwise if
+	" 1. characterwise selection and valid values for vstart and vend.
+	" OR
+	" 2. linewise selection and invalid values for VStart and VEnd
+	if (visualmode() == 'v' && (a:vstart != '' || a:vend != '')) || (a:VStart == '' && a:VEnd == '')
+
+		let newline = ""
+		let _r = @r
+
+		let normcmd = "normal! \<C-\>\<C-n>`<v`>\"_s"
+
+		exe "normal! \<C-\>\<C-n>`<v`>\"ry"
+		if @r =~ "\n$"
+			let newline = "\n"
+			let @r = substitute(@r, "\n$", '', '')
+		endif
+
+		" In exclusive selection, we need to select an extra character.
+		if &selection == 'exclusive'
+			let movement = 8
+		else
+			let movement = 7
+		endif
+		let normcmd = normcmd.
+			\ a:vstart."!!mark!!".a:vend.newline.
+			\ "\<C-\>\<C-N>?!!mark!!\<CR>v".movement."l\"_s\<C-r>r\<C-\>\<C-n>"
+
+		" this little if statement is because till very recently, vim used to
+		" report col("'>") > length of selected line when `> is $. on some
+		" systems it reports a -ve number.
+		if col("'>") < 0 || col("'>") > strlen(getline("'>"))
+			let lastcol = strlen(getline("'>"))
+		else
+			let lastcol = col("'>")
+		endif
+		if lastcol - col("'<") != 0
+			let len = lastcol - col("'<")
+		else
+			let len = ''
+		endif
+
+		" the next normal! is for restoring the marks.
+		let normcmd = normcmd."`<v".len."l\<C-\>\<C-N>"
+
+		" First remember what the search pattern was. s:RemoveLastHistoryItem
+		" will reset @/ to this pattern so we do not create new highlighting.
+		let g:Tex_LastSearchPattern = @/
+
+		silent! exe normcmd
+		" this is to restore the r register.
+		let @r = _r
+		" and finally, this is to restore the search history.
+		execute s:RemoveLastHistoryItem
+
+	else
+
+		exec 'normal! `<O'.a:VStart."\<C-\>\<C-n>"
+		exec 'normal! `>o'.a:VEnd."\<C-\>\<C-n>"
+		if &indentexpr != ''
+			silent! normal! `<kV`>j=
+		endif
+		silent! normal! `>
+	endif
+endfunction 
+
+" }}}
+" ExecMap: adds the ability to correct an normal/visual mode mapping.  {{{
+" Author: Hari Krishna Dara <hari_vim@yahoo.com>
+" Reads a normal mode mapping at the command line and executes it with the
+" given prefix. Press <BS> to correct and <Esc> to cancel.
+function! ExecMap(prefix, mode)
+	" Temporarily remove the mapping, otherwise it will interfere with the
+	" mapcheck call below:
+	let myMap = maparg(a:prefix, a:mode)
+	exec a:mode."unmap ".a:prefix
+
+	" Generate a line with spaces to clear the previous message.
+	let i = 1
+	let clearLine = "\r"
+	while i < &columns
+		let clearLine = clearLine . ' '
+		let i = i + 1
+	endwhile
+
+	let mapCmd = a:prefix
+	let foundMap = 0
+	let breakLoop = 0
+	echon "\rEnter Map: " . mapCmd
+	while !breakLoop
+		let char = getchar()
+		if char !~ '^\d\+$'
+			if char == "\<BS>"
+				let mapCmd = strpart(mapCmd, 0, strlen(mapCmd) - 1)
+			endif
+		else " It is the ascii code.
+			let char = nr2char(char)
+			if char == "\<Esc>"
+				let breakLoop = 1
+			else
+				let mapCmd = mapCmd . char
+				if maparg(mapCmd, a:mode) != ""
+					let foundMap = 1
+					let breakLoop = 1
+				elseif mapcheck(mapCmd, a:mode) == ""
+					let mapCmd = strpart(mapCmd, 0, strlen(mapCmd) - 1)
+				endif
+			endif
+		endif
+		echon clearLine
+		echon "\rEnter Map: " . mapCmd
+	endwhile
+	if foundMap
+		if a:mode == 'v'
+			" use a plug to select the region instead of using something like
+			" `<v`> to avoid problems caused by some of the characters in
+			" '`<v`>' being mapped.
+			let gotoc = "\<plug><+SelectRegion+>"
+		else
+			let gotoc = ''
+		endif
+		exec "normal ".gotoc.mapCmd
+	endif
+	exec a:mode.'noremap '.a:prefix.' '.myMap
+endfunction
+
+" }}}
+
+" ============================================================================== 
+" helper functions
+" ============================================================================== 
+" Strntok: extract the n^th token from a list {{{
+" example: Strntok('1,23,3', ',', 2) = 23
+fun! <SID>Strntok(s, tok, n)
+	return matchstr( a:s.a:tok[0], '\v(\zs([^'.a:tok.']*)\ze['.a:tok.']){'.a:n.'}')
+endfun
+
+" }}}
+" s:RemoveLastHistoryItem: removes last search item from search history {{{
+" Description: Execute this string to clean up the search history.
+let s:RemoveLastHistoryItem = ':call histdel("/", -1)|let @/=g:Tex_LastSearchPattern'
+
+" }}}
+" s:Hash: Return a version of a string that can be used as part of a variable" {{{
+" name.
+" 	Converts every non alphanumeric character into _{ascii}_ where {ascii} is
+" 	the ASCII code for that character...
+fun! s:Hash(text)
+	return substitute(a:text, '\([^[:alnum:]]\)',
+				\ '\="_".char2nr(submatch(1))."_"', 'g')
+endfun
+"" }}}
+" IMAP_GetPlaceHolderStart and IMAP_GetPlaceHolderEnd:  "{{{
+" return the buffer local placeholder variables, or the global one, or the default.
+function! IMAP_GetPlaceHolderStart()
+	if exists("b:Imap_PlaceHolderStart") && strlen(b:Imap_PlaceHolderEnd)
+		return b:Imap_PlaceHolderStart
+	elseif exists("g:Imap_PlaceHolderStart") && strlen(g:Imap_PlaceHolderEnd)
+		return g:Imap_PlaceHolderStart
+	else
+		return "<+"
+endfun
+function! IMAP_GetPlaceHolderEnd()
+	if exists("b:Imap_PlaceHolderEnd") && strlen(b:Imap_PlaceHolderEnd)
+		return b:Imap_PlaceHolderEnd
+	elseif exists("g:Imap_PlaceHolderEnd") && strlen(g:Imap_PlaceHolderEnd)
+		return g:Imap_PlaceHolderEnd
+	else
+		return "+>"
+endfun
+" }}}
+" s:Iconv:  a wrapper for iconv()" {{{
+" Problem:  after
+" 	let text = "\xab"
+" (or using the raw 8-bit ASCII character in a file with 'fenc' set to
+" "latin1") if 'encoding' is set to utf-8, then text does not match itself:
+" 	echo text =~ text
+" returns 0.
+" Solution:  When this happens, a re-encoded version of text does match text:
+" 	echo iconv(text, "latin1", "utf8") =~ text
+" returns 1.  In this case, convert text to utf-8 with iconv().
+" TODO:  Is it better to use &encoding instead of "utf8"?  Internally, vim
+" uses utf-8, and can convert between latin1 and utf-8 even when compiled with
+" -iconv, so let's try using utf-8.
+" Arguments:
+" 	a:text = text to be encoded or decoded
+" 	a:mode = "encode" (latin1 to utf8) or "decode" (utf8 to latin1)
+" Caution:  do not encode and then decode without checking whether the text
+" has changed, becuase of the :if clause in encoding!
+function! s:Iconv(text, mode)
+	if a:mode == "decode"
+		return iconv(a:text, "utf8", "latin1")
+	endif
+	if a:text =~ '\V\^' . escape(a:text, '\') . '\$'
+		return a:text
+	endif
+	let textEnc = iconv(a:text, "latin1", "utf8")
+	if textEnc !~ '\V\^' . escape(a:text, '\') . '\$'
+		call IMAP_Debug('Encoding problems with text '.a:text.' ', 'imap')
+	endif
+	return textEnc
+endfun
+"" }}}
+" IMAP_Debug: interface to Tex_Debug if available, otherwise emulate it {{{
+" Description: 
+" Do not want a memory leak! Set this to zero so that imaps always
+" starts out in a non-debugging mode.
+if !exists('g:Imap_Debug')
+	let g:Imap_Debug = 0
+endif
+function! IMAP_Debug(string, pattern)
+	if !g:Imap_Debug
+		return
+	endif
+	if exists('*Tex_Debug')
+		call Tex_Debug(a:string, a:pattern)
+	else
+		if !exists('s:debug_'.a:pattern)
+			let s:debug_{a:pattern} = a:string
+		else
+			let s:debug_{a:pattern} = s:debug_{a:pattern}.a:string
+		endif
+	endif
+endfunction " }}}
+" IMAP_DebugClear: interface to Tex_DebugClear if avaialable, otherwise emulate it {{{
+" Description: 
+function! IMAP_DebugClear(pattern)
+	if exists('*Tex_DebugClear')
+		call Tex_DebugClear(a:pattern)
+	else	
+		let s:debug_{a:pattern} = ''
+	endif
+endfunction " }}}
+" IMAP_PrintDebug: interface to Tex_DebugPrint if avaialable, otherwise emulate it {{{
+" Description: 
+function! IMAP_PrintDebug(pattern)
+	if exists('*Tex_PrintDebug')
+		call Tex_PrintDebug(a:pattern)
+	else
+		if exists('s:debug_'.a:pattern)
+			echo s:debug_{a:pattern}
+		endif
+	endif
+endfunction " }}}
+" IMAP_Mark:  Save the cursor position (if a:action == 'set') in a" {{{
+" script-local variable; restore this position if a:action == 'go'.
+let s:Mark = "(0,0)"
+let s:initBlanks = ''
+function! IMAP_Mark(action)
+	if a:action == 'set'
+		let s:Mark = "(" . line(".") . "," . col(".") . ")"
+		let s:initBlanks = matchstr(getline('.'), '^\s*')
+	elseif a:action == 'go'
+		execute "call cursor" s:Mark
+		let blanksNow = matchstr(getline('.'), '^\s*')
+		if strlen(blanksNow) > strlen(s:initBlanks)
+			execute 'silent! normal! '.(strlen(blanksNow) - strlen(s:initBlanks)).'l'
+		elseif strlen(blanksNow) < strlen(s:initBlanks)
+			execute 'silent! normal! '.(strlen(s:initBlanks) - strlen(blanksNow)).'h'
+		endif
+	endif
+endfunction	"" }}}
+" IMAP_GetVal: gets the value of a variable {{{
+" Description: first checks window local, then buffer local etc.
+function! IMAP_GetVal(name, ...)
+	if a:0 > 0
+		let default = a:1
+	else
+		let default = ''
+	endif
+	if exists('w:'.a:name)
+		return w:{a:name}
+	elseif exists('b:'.a:name)
+		return b:{a:name}
+	elseif exists('g:'.a:name)
+		return g:{a:name}
+	else
+		return default
+	endif
+endfunction " }}}
+
+" ============================================================================== 
+" A bonus function: Snip()
+" ============================================================================== 
+" Snip: puts a scissor string above and below block of text {{{
+" Desciption:
+"-------------------------------------%<-------------------------------------
+"   this puts a the string "--------%<---------" above and below the visually
+"   selected block of lines. the length of the 'tearoff' string depends on the
+"   maximum string length in the selected range. this is an aesthetically more
+"   pleasing alternative instead of hardcoding a length.
+"-------------------------------------%<-------------------------------------
+function! <SID>Snip() range
+	let i = a:firstline
+	let maxlen = -2
+	" find out the maximum virtual length of each line.
+	while i <= a:lastline
+		exe i
+		let length = virtcol('$')
+		let maxlen = (length > maxlen ? length : maxlen)
+		let i = i + 1
+	endwhile
+	let maxlen = (maxlen > &tw && &tw != 0 ? &tw : maxlen)
+	let half = maxlen/2
+	exe a:lastline
+	" put a string below
+	exe "norm! o\<esc>".(half - 1)."a-\<esc>A%<\<esc>".(half - 1)."a-"
+	" and above. its necessary to put the string below the block of lines
+	" first because that way the first line number doesnt change...
+	exe a:firstline
+	exe "norm! O\<esc>".(half - 1)."a-\<esc>A%<\<esc>".(half - 1)."a-"
+endfunction
+
+com! -nargs=0 -range Snip :<line1>,<line2>call <SID>Snip()
+" }}}
+
+" vim:ft=vim:ts=4:sw=4:noet:fdm=marker:commentstring=\"\ %s:nowrap
diff --git a/.vim/plugin/jad.vim b/.vim/plugin/jad.vim
new file mode 100644
index 0000000..f6e7741
--- /dev/null
+++ b/.vim/plugin/jad.vim
@@ -0,0 +1,66 @@
+" File:         jad.vim
+" Purpose:      Vim plugin for viewing decompiled class files using 'jad' decompiler.
+" Ideas:        Allow for a default to be set in the vimrc
+"               - map a keystroke to decompile and edit, or decompile and view in split window
+" Date Created: 10-14-2002
+" Last Modified:10-22-2002
+" Version:      1.3
+
+if exists("loaded_jad") || &cp || exists("#BufReadPre#*.class")
+  finish
+endif
+let loaded_jad = 1
+
+augroup class
+  " Remove all jad autocommands
+  au!
+  " Enable editing of jaded files
+  " set binary mode before reading the file
+  " add your preferable flags after "jad" (for instance "jad -f -dead -ff -a")
+  autocmd BufReadPre,FileReadPre	*.class  set bin
+  autocmd BufReadPost,FileReadPost	*.class  call s:read("jad")
+augroup END
+
+" Function to check that executing "cmd [-f]" works.
+" The result is cached in s:have_"cmd" for speed.
+fun s:check(cmd)
+  let name = substitute(a:cmd, '\(\S*\).*', '\1', '')
+  if !exists("s:have_" . name)
+    let e = executable(name)
+    if e < 0
+      let r = system(name . " --version")
+      let e = (r !~ "not found" && r != "")
+    endif
+    exe "let s:have_" . name . "=" . e
+  endif
+  exe "return s:have_" . name
+endfun
+
+" After reading decompiled file: Decompiled text in buffer with "cmd"
+fun s:read(cmd)
+  " don't do anything if the cmd is not supported
+  if !s:check(a:cmd)
+    return
+  endif
+  " make 'patchmode' empty, we don't want a copy of the written file
+  let pm_save = &pm
+  set pm      =
+  " set 'modifiable'
+  set ma
+  " when filtering the whole buffer, it will become empty
+  let empty   = line("'[") == 1 && line("']") == line("$")
+  let jadfile = expand("<afile>:r") . ".jad"
+  let orig    = expand("<afile>")
+  " now we have no binary file, so set 'nobinary'
+  set nobin
+  "Split and show code in a new window
+  g/.*/d
+  execute "silent r !" a:cmd . " -p " . orig
+  1
+  " set file name, type and file syntax to java
+  execute ":file " . jadfile
+  set ft      =java
+  set syntax  =java
+  " recover global variables
+  let &pm     = pm_save
+endfun
diff --git a/.vim/plugin/lodgeit.vim b/.vim/plugin/lodgeit.vim
new file mode 100644
index 0000000..4053b0b
--- /dev/null
+++ b/.vim/plugin/lodgeit.vim
@@ -0,0 +1,134 @@
+" lodgeit.vim: Vim plugin for paste.pocoo.org
+" Maintainer:   Armin Ronacher <armin.ronacher@active-4.com>
+" Version:      0.1.5
+
+" Usage:
+"   :Lodgeit    create a paste from the current buffer of selection
+"   :e <url>    download a paste. If you then use :Lodgeit you can
+"               reply to that paste.
+"
+" If you want to paste on ctrl + p just add this to your vimrc:
+" 	map ^P :Lodgeit<CR>
+" (where ^P is entered using ctrl + v, ctrl + p in vim)
+
+function! s:LodgeitInit()
+python << EOF
+
+import vim
+import re
+from xmlrpclib import ServerProxy
+srv = ServerProxy('http://paste.pocoo.org/xmlrpc/', allow_none=True)
+
+new_paste = srv.pastes.newPaste
+get_paste = srv.pastes.getPaste
+
+language_mapping = {
+    'python':           'python',
+    'php':              'html+php',
+    'smarty':           'smarty',
+    'tex':              'tex',
+    'rst':              'rst',
+    'cs':               'csharp',
+    'haskell':          'haskell',
+    'xml':              'xml',
+    'html':             'html',
+    'xhtml':            'html',
+    'htmldjango':       'html+django',
+    'django':           'html+django',
+    'htmljinja':        'html+django',
+    'jinja':            'html+django',
+    'lua':              'lua',
+    'scheme':           'scheme',
+    'mako':             'html+mako',
+    'c':                'c',
+    'cpp':              'cpp',
+    'javascript':       'js',
+    'jsp':              'jsp',
+    'ruby':             'ruby',
+    'bash':             'bash',
+    'bat':              'bat',
+    'd':                'd',
+    'genshi':           'html+genshi'
+}
+
+language_reverse_mapping = {}
+for key, value in language_mapping.iteritems():
+    language_reverse_mapping[value] = key
+
+def paste_id_from_url(url):
+    regex = re.compile(r'^http://paste.pocoo.org/show/(\d+)/?$')
+    m = regex.match(url)
+    if m is not None:
+        return int(m.group(1))
+
+def make_utf8(code):
+    enc = vim.eval('&fenc') or vim.eval('&enc')
+    return code.decode(enc, 'ignore').encode('utf-8')
+
+EOF
+endfunction
+
+
+function! s:Lodgeit(line1,line2,count,...)
+call s:LodgeitInit()
+python << endpython
+
+# download paste
+if vim.eval('a:0') == '1':
+    paste = paste_id = None
+    arg = vim.eval('a:1')
+
+    if arg.startswith('#'):
+        try:
+            paste_id = int(arg[1:])
+        except:
+            pass
+    if paste_id is None:
+        paste_id = paste_id_from_url(vim.eval('a:1'))
+    if paste_id is not None:
+        paste = get_paste(paste_id)
+
+    if paste:
+        vim.command('tabnew')
+        vim.command('file Lodgeit\ Paste\ \#%d"' % paste_id)
+        vim.current.buffer[:] = paste['code'].splitlines()
+        vim.command('setlocal ft=' + language_reverse_mapping.
+                    get(paste['language'], 'text'))
+        vim.command('setlocal nomodified')
+        vim.command('let b:lodgeit_paste_id=%d' % paste_id)
+    else:
+        print 'Paste not Found'
+
+# new paste or reply
+else:
+    rng_start = int(vim.eval('a:line1')) - 1
+    rng_end = int(vim.eval('a:line2'))
+    if int(vim.eval('a:count')):
+        code = '\n'.join(vim.current.buffer[rng_start:rng_end])
+    else:
+        code = '\n'.join(vim.current.buffer)
+    code = make_utf8(code)
+
+    parent = None
+    update_buffer_info = False
+    if vim.eval('exists("b:lodgeit_paste_id")') == '1':
+        parent = int(vim.eval('b:lodgeit_paste_id'))
+        update_buffer_info = True
+
+    lng_code = language_mapping.get(vim.eval('&ft'), 'text')
+    paste_id = new_paste(lng_code, code, parent)
+    url = 'http://paste.pocoo.org/show/%d' % paste_id
+
+    print 'Pasted #%d to %s' % (paste_id, url)
+    vim.command(':call setreg(\'+\', %r)' % url)
+
+    if update_buffer_info:
+        vim.command('file Lodgeit\ Paste\ \#%d"' % paste_id)
+        vim.command('setlocal nomodified')
+        vim.command('let b:lodgeit_paste_id=%d' % paste_id)
+
+endpython
+endfunction
+
+
+command! -range=0 -nargs=* Lodgeit :call s:Lodgeit(<line1>,<line2>,<count>,<f-args>)
diff --git a/.vim/plugin/pastie.vim b/.vim/plugin/pastie.vim
new file mode 100644
index 0000000..b001508
--- /dev/null
+++ b/.vim/plugin/pastie.vim
@@ -0,0 +1,537 @@
+" pastie.vim: Vim plugin for pastie.caboo.se
+" Maintainer: Tim Pope <vimNOSPAM@tpope.info>
+" URL:        http://www.vim.org/scripts/script.php?script_id=1624
+" GetLatestVimScripts: 1624 1
+" $Id: pastie.vim,v 1.15 2007-12-13 16:44:26 tpope Exp $
+
+" Installation:
+" Place in ~/.vim/plugin or vimfiles/plugin
+" A working ruby install is required (Vim interface not necessary).
+
+" Usage:
+" :Pastie creates a new paste (example arguments shown below).  Use :w to save
+" it by posting it to the server (the parser used is derived from the Vim
+" filetype).  This updates the filename and stores the new url in the primary
+" selection/clipboard when successful.  :Pastie!  creates a paste, saves, and
+" closes the buffer, except when loading an existing paste.
+
+" :Pastie                   Create a paste from all open windows
+" :Pastie!                  Create a paste from all open windows and paste it
+" :1,10Pastie               Create a paste from the specified range
+" :%Pastie                  Use the entire current file to create a new paste
+" :Pastie foo.txt bar.txt   Create a paste from foo.txt and bar.txt
+" :Pastie! foo.txt          Paste directly from foo.txt
+" :Pastie a                 Create a paste from the "a register
+" :Pastie @                 Create a paste from the default (unnamed) register
+" :Pastie *                 Create a paste from the primary selection/clipboard
+" :Pastie _                 Create a new, blank paste
+" :768Pastie                Load existing paste 768
+" :0Pastie                  Load the newest paste
+" :Pastie http://pastie.caboo.se/768            Load existing paste 768
+" :Pastie http://pastie.caboo.se/123456?key=... Use login from pastie bot
+
+" Regardless of the command used, on the first write, this script will create
+" a new paste, and on subsequent writes, it will update the existing paste.
+" If a bang is passed to a command that load an existing paste (:768), the
+" first write will update as well.  If the loaded paste was not created in the
+" same vim session, or with an account extracted from your Firefox cookies,
+" updates will almost certainly silently fail.  (Advanced users can muck
+" around with g:pastie_session_id if desired).
+
+" As hinted at earlier, pastie.vim will snoop around in your Firefox cookies,
+" and use an account cookie if one is found.  The only way to create one of
+" these account cookies is by talking to pastie on IRC.
+
+" At the shell you can directly create a new pastie with a command like
+" $ vim +Pastie
+" or, assuming no other plugins conflict
+" $ vim +Pa
+" And, to read an existing paste
+" $ vim +768Pa
+" You could even paste a file directly
+" $ vim '+Pa!~/.irbrc' +q
+" You can even edit a pastie URL directly, but this is not recommended because
+" netrw can sometimes interfere.
+
+" Lines ending in #!! will be sent as lines beginning with !!.  This alternate
+" format is easier to read and is less likely to interfere with code
+" execution.  In Vim 7 highlighting is done with :2match (use ":2match none"
+" to disable it) and in previous versions, :match (use ":match none" to
+" disable).
+"
+" Known Issues:
+" URL sometimes disappears with the bang (:Pastie!) variant.  You can still
+" retrieve it from the clipboard.
+
+if exists("g:loaded_pastie") || &cp
+    finish
+endif
+let g:loaded_pastie = 1
+
+augroup pastie
+    autocmd!
+    autocmd BufReadPre  http://pastie.caboo.se/*[0-9]?key=*           call s:extractcookies(expand("<amatch>"))
+    autocmd BufReadPost http://pastie.caboo.se/*[0-9]?key=*           call s:PastieSwapout(expand("<amatch>"))
+    autocmd BufReadPost http://pastie.caboo.se/*[0-9]                 call s:PastieSwapout(expand("<amatch>"))
+    autocmd BufReadPost http://pastie.caboo.se/pastes/*[0-9]/download call s:PastieRead(expand("<amatch>"))
+    autocmd BufReadPost http://pastie.caboo.se/*[0-9].*               call s:PastieRead(expand("<amatch>"))
+    autocmd BufWriteCmd http://pastie.caboo.se/pastes/*[0-9]/download call s:PastieWrite(expand("<amatch>"))
+    autocmd BufWriteCmd http://pastie.caboo.se/*[0-9].*               call s:PastieWrite(expand("<amatch>"))
+    autocmd BufWriteCmd http://pastie.caboo.se/pastes/                call s:PastieWrite(expand("<amatch>"))
+augroup END
+
+let s:domain = "pastie.caboo.se"
+
+let s:dl_suffix = ".txt" " Used only for :file
+
+if !exists("g:pastie_destination")
+    if version >= 700
+        let g:pastie_destination = 'tab'
+    else
+        let g:pastie_destination = 'window'
+    endif
+    "let g:pastie_destination = 'buffer'
+endif
+
+command! -bar -bang -nargs=* -range=0 -complete=file Pastie :call s:Pastie(<bang>0,<line1>,<line2>,<count>,<f-args>)
+
+function! s:Pastie(bang,line1,line2,count,...)
+    if exists(":tab")
+        let tabnr = tabpagenr()
+    endif
+    let newfile = "http://".s:domain."/pastes/"
+    let loggedin = 0
+    let ft = &ft
+    let num = 0
+    if a:0 == 0 && a:count == a:line1 && a:count > line('$')
+        let num = a:count
+    elseif a:0 == 0 && a:line1 == 0 && a:line2 == 0
+        let num = s:latestid()
+        if num == 0
+            return s:error("Could not determine latest paste")
+        endif
+    elseif !a:count && a:0 == 1
+        if a:1 == '*'
+            let numcheck = @*
+        elseif a:1 == '+'
+            let numcheck = @+
+        elseif a:1 == '@'
+            let numcheck = @@
+        else
+            let numcheck = a:1
+        endif
+        let numcheck = substitute(numcheck,'\n\+$','','')
+        let numcheck = substitute(numcheck,'^\n\+','','g')
+        if numcheck =~ '\n'
+            let numcheck = ''
+        endif
+        if numcheck =~ '^\d\d+$'
+            let num = numcheck
+        elseif numcheck =~ '\%(^\|/\)\d\+?key=\x\{8,\}'
+            if exists("b:pastie_fake_login")
+                unlet b:pastie_fake_login
+            else
+                call s:extractcookies('/'.matchstr(numcheck,'\%(^\|/\)\zs\d\+?.*'))
+            endif
+            if exists("g:pastie_account")
+                let loggedin = 1
+            endif
+            let num = matchstr(numcheck,'\%(^\|/\)\zs\d\+\ze?')
+        elseif numcheck =~ '\%(^\|^/\|^http://.*\)\d\+\%([/?]\|$\)'
+            let num = matchstr(numcheck,'\%(^\|/\)\zs\d\+')
+        endif
+    endif
+    if num
+        call s:newwindow()
+        let file = "http://".s:domain."/".num.s:dl_suffix
+        silent exe 'doautocmd BufReadPre '.file
+        silent exe 'read !ruby -rnet/http -e "r = Net::HTTP.get_response(\%{'.s:domain.'}, \%{/pastes/'.num.'/download}); if r.code == \%{200} then print r.body else exit 10+r.code.to_i/100 end"'
+        if v:shell_error && v:shell_error != 14 && v:shell_error !=15
+            return s:error("Something went wrong: shell returned ".v:shell_error)
+        else
+            let err = v:shell_error
+            silent exe "file ".file
+            1d_
+            set nomodified
+            call s:dobufreadpost()
+            if err
+                if loggedin
+                    let b:pastie_update = 1
+                else
+                    echohl WarningMsg
+                    echo "Warning: Failed to retrieve existing paste"
+                    echohl None
+                endif
+            endif
+            "call s:PastieRead(file)
+            if a:bang
+                " Instead of saving an identical paste, take ! to mean "do not
+                " create a new paste on first save"
+                let b:pastie_update = 1
+            endif
+            return
+        endif
+    elseif a:0 == 0 && !a:count && a:bang && expand("%") =~ '^http://'.s:domain.'/\d\+'
+        " If the :Pastie! form is used in an existing paste, switch to
+        " updating instead of creating.
+        "echohl Question
+        echo "Will update, not create"
+        echohl None
+        let b:pastie_update = 1
+        return
+    elseif a:0 == 1 && !a:count && a:1 =~ '^[&?]\x\{32,\}'
+        " Set session id with :Pastie&deadbeefcafebabe
+        let g:pastie_session_id = strpart(a:1,1)
+    elseif a:0 == 1 && !a:count && (a:1 == '&' || a:1 == '?')
+        " Extract session id with :Pastie&
+        call s:cookies()
+        if exists("g:pastie_session_id")
+            echo g:pastie_session_id
+            "silent! let @* = g:pastie_session_id
+        endif
+    elseif a:0 == 0 && !a:count && a:line1
+        let ft = 'conf'
+        let sum = ""
+        let cnt = 0
+        let keep = @"
+        windo let tmp = s:grabwin() | if tmp != "" | let cnt = cnt + 1 | let sum = sum . tmp | end
+        let sum = substitute(sum,'\n\+$',"\n",'')
+        if cnt == 1
+            let ft = matchstr(sum,'^##.\{-\} \[\zs\w*\ze\]')
+            if ft != ""
+                let sum = substitute(sum,'^##.\{-\} \[\w*\]\n','','')
+            endif
+        endif
+        call s:newwindow()
+        silent exe "file ".newfile
+        "silent exe "doautocmd BufReadPre ".newfile
+        if sum != ""
+            let @" = sum
+            silent $put
+            1d _
+        endif
+        if ft == 'plaintext' || ft == 'plain_text'
+            "set ft=conf
+        elseif ft != '' && sum != ""
+            let &ft = ft
+        endif
+        let @" = keep
+        call s:dobufreadpost()
+    else
+        let keep = @"
+        let args = ""
+        if a:0 > 0 && a:1 =~ '^[-"@0-9a-zA-Z:.%#*+~_/]$'
+            let i = 1
+            let register = a:1
+        else
+            let i = 0
+            let register = ""
+        endif
+        while i < a:0
+            let i = i+1
+            if strlen(a:{i})
+                let file = fnamemodify(expand(a:{i}),':~:.')
+                let args = args . file . "\n"
+            endif
+        endwhile
+        let range = ""
+        if a:count
+            silent exe a:line1.",".a:line2."yank"
+            let range = @"
+            let @" = keep
+        endif
+        call s:newwindow()
+        silent exe "file ".newfile
+        "silent exe "doautocmd BufReadPre ".newfile
+        if range != ""
+            let &ft = ft
+            let @" = range
+            silent $put
+        endif
+        if register != '' && register != '_'
+            "exe "let regvalue = @".register
+            silent exe "$put ".(register =~ '^[@"]$' ? '' : register)
+        endif
+        while args != ''
+            let file = matchstr(args,'^.\{-\}\ze\n')
+            let args = substitute(args,'^.\{-\}\n','','')
+            let @" = "## ".file." [".s:parser(file)."]\n"
+            if a:0 != 1 || a:count
+                silent $put
+            else
+                let &ft = s:filetype(file)
+            endif
+            silent exe "$read ".substitute(file,' ','\ ','g')
+        endwhile
+        let @" = keep
+        1d_
+        call s:dobufreadpost()
+        if (a:0 + (a:count > 0)) > 1
+            set ft=conf
+        endif
+    endif
+    1
+    call s:afterload()
+    if a:bang
+        write
+        let name = bufname('%')
+        " TODO: re-echo the URL in a way that doesn't disappear. Stupid Vim.
+        silent! bdel
+        if exists("tabnr")
+            silent exe "norm! ".tabnr."gt"
+        endif
+    endif
+endfunction
+
+function! s:dobufreadpost()
+    if expand("%") =~ '/\d\+\.\@!'
+        silent exe "doautocmd BufReadPost ".expand("%")
+    else
+        silent exe "doautocmd BufNewFile ".expand("%")
+    endif
+endfunction
+
+function! s:PastieSwapout(file)
+    if a:file =~ '?key='
+        let b:pastie_fake_login = 1
+    endif
+    exe "Pastie ".a:file
+endfunction
+
+function! s:PastieRead(file)
+    let lnum = line(".")
+    silent %s/^!!\(.*\)/\1 #!!/e
+    exe lnum
+    set nomodified
+    let num = matchstr(a:file,'/\@<!/\zs\d\+')
+    let url = "http://".s:domain."/pastes/".num
+    "let url = substitute(a:file,'\c/\%(download/\=\|text/\=\)\=$','','')
+    let url = url."/download"
+    let result = system('ruby -rnet/http -e "puts Net::HTTP.get_response(URI.parse(%{'.url.'}))[%{Content-Disposition}]"')
+    let fn = matchstr(result,'filename="\zs.*\ze"')
+    let &ft = s:filetype(fn)
+    if &ft =~ '^\%(html\|ruby\)$' && getline(1).getline(2).getline(3) =~ '<%'
+        set ft=eruby
+    endif
+    call s:afterload()
+endfunction
+
+function! s:afterload()
+    set commentstring=%s\ #!! "
+    hi def link pastieIgnore    Ignore
+    hi def link pastieNonText   NonText
+    if exists(":match")
+        hi def link pastieHighlight MatchParen
+        if version >= 700
+            2match pastieHighlight /^!!\s*.*\|^.\{-\}\ze\s*#!!\s*$/
+        else
+            match  pastieHighlight /^!!\s*.*\|^.\{-\}\ze\s*#!!\s*$/
+        endif
+    else
+        hi def link pastieHighlight Search
+        syn match pastieHighlight '^.\{-\}\ze\s*#!!\s*$' nextgroup=pastieIgnore skipwhite
+        syn region pastieHighlight start='^!!\s*' end='$' contains=pastieNonText
+    endif
+    syn match pastieIgnore '#!!\ze\s*$' containedin=rubyComment,rubyString
+    syn match pastieNonText '^!!' containedin=rubyString
+endfunction
+
+function! s:PastieWrite(file)
+    let parser = s:parser(&ft)
+    let tmp = tempname()
+    let num = matchstr(a:file,'/\@<!/\zs\d\+')
+    if num == ''
+        let num = 'pastes'
+    endif
+    if exists("b:pastie_update") && s:cookies() != '' && num != ""
+        let url = "/pastes/".num
+        let method = "_method=put&"
+    else
+        let url = "/pastes"
+        let method = ""
+    endif
+    if exists("b:pastie_display_name")
+        let pdn = "&paste[display_name]=".s:urlencode(b:pastie_display_name)
+    elseif exists("g:pastie_display_name")
+        let pdn = "&paste[display_name]=".s:urlencode(g:pastie_display_name)
+    else
+        let pdn = ""
+    endif
+    silent exe "write ".tmp
+    let result = ""
+    let rubycmd = 'obj = Net::HTTP.start(%{'.s:domain.'}){|h|h.post(%{'.url.'}, %q{'.method.'paste[parser]='.parser.pdn.'&paste[authorization]=burger&paste[key]=&paste[body]=} + File.read(%q{'.tmp.'}).gsub(/^(.*?) *#\!\! *#{36.chr}/,%{!\!}+92.chr+%{1}).gsub(/[^a-zA-Z0-9_.-]/n) {|s| %{%%%02x} % s[0]},{%{Cookie} => %{'.s:cookies().'}})}; print obj[%{Location}].to_s+%{ }+obj[%{Set-Cookie}].to_s'
+    let result = system('ruby -rnet/http -e "'.rubycmd.'"')
+    let redirect = matchstr(result,'^[^ ]*')
+    let cookies  = matchstr(result,'^[^ ]* \zs.*')
+    call s:extractcookiesfromheader(cookies)
+    call delete(tmp)
+    if redirect =~ '^\w\+://'
+        set nomodified
+        let b:pastie_update = 1
+        "silent! let @+ = result
+        silent! let @* = redirect
+        silent exe "file ".redirect.s:dl_suffix
+        " TODO: make a proper status message
+        echo '"'.redirect.'" written'
+        silent exe "doautocmd BufWritePost ".redirect.s:dl_suffix
+    else
+        if redirect == ''
+            let redirect = "Could not post to ".url
+        endif
+        let redirect = substitute(redirect,'^-e:1:\s*','','')
+        call s:error(redirect)
+    endif
+endfunction
+
+function! s:error(msg)
+    echohl Error
+    echo a:msg
+    echohl NONE
+    let v:errmsg = a:msg
+endfunction
+
+function! s:filetype(type)
+    " Accepts a filename, extension, pastie parser, or vim filetype
+    let type = tolower(substitute(a:type,'.*\.','',''))
+    if type =~ '^\%(x\=html\|asp\w*\)$'
+        return 'html'
+    elseif type =~ '^\%(eruby\|erb\|rhtml\)$'
+        return 'eruby'
+    elseif type =~ '^\%(ruby\|ruby_on_rails\|rb\|rake\|builder\|rjs\|irbrc\)'
+        return 'ruby'
+    elseif type == 'js' || type == 'javascript'
+        return 'javascript'
+    elseif type == 'c' || type == 'cpp' || type == 'c++'
+        return 'cpp'
+    elseif type =~ '^\%(css\|diff\|java\|php\|python\|sql\|sh\|shell-unix-generic\)$'
+        return type
+    else
+        return ''
+    endif
+endfunction
+
+function! s:parser(type)
+    let type = s:filetype(a:type)
+    if type == 'text' || type == ''
+        return 'plain_text'
+    elseif type == 'eruby'
+        return 'html_rails'
+    elseif type == 'ruby'
+        return 'ruby_on_rails'
+    elseif type == 'sh'
+        return 'shell-unix-generic'
+    elseif type == 'cpp'
+        return 'c++'
+    else
+        return type
+    endif
+endfunction
+
+function! s:grabwin()
+    let ft = (&ft == '' ? expand("%:e") : &ft)
+    let top = "## ".expand("%:~:.")." [".s:parser(ft)."]\n"
+    let keep = @"
+    silent %yank
+    let file = @"
+    let @" = keep
+    if file == "" || file == "\n"
+        return ""
+    else
+        return top.file."\n"
+    endif
+endfunction
+
+function! s:cookies()
+    if exists("g:pastie_session_id")
+        let cookies = "_pastie_session_id=".g:pastie_session_id
+    else
+        call s:extractcookies('/')
+        if !exists("g:pastie_session_id")
+            if !exists("s:session_warning")
+                echohl WarningMsg
+                echo "Warning: could not extract session id"
+                let s:session_warning = 1
+                echohl NONE
+            endif
+            let cookies = ""
+        else
+            let cookies = "_pastie_session_id=".g:pastie_session_id
+        endif
+    endif
+    if !exists("g:pastie_account")
+        let rubycmd = '%w(~/.mozilla/firefox ~/.firefox/default ~/.phoenix/default ~/Application\ Data/Mozilla/Firefox/Profiles ~/Library/Application\ Support/Firefox/Profiles)'
+        let rubycmd = rubycmd . '.each {|dir| Dir[File.join(File.expand_path(dir),%{*})].select {|p| File.exists?(File.join(p,%{cookies.txt}))}.each {|p| File.open(File.join(p,%{cookies.txt})).each_line { |l| a=l.split(9.chr); puts [a[4],a[6]].join(%{ }) if a[0] =~ /pastie\.caboo\.se#{36.chr}/ && Time.now.to_i < a[4].to_i && a[5] == %{account} }}}'
+        let output = ''
+        let output = system('ruby -e "'.rubycmd.'"')
+        if output =~ '\n' && output !~ '-e:'
+            let output = substitute(output,'\n.*','','')
+            let g:pastie_account = matchstr(output,' \zs.*')
+            let g:pastie_account_expires = matchstr(output,'.\{-\}\ze ')
+        else
+            let g:pastie_account = ''
+        endif
+    endif
+    if exists("g:pastie_account") && g:pastie_account != ""
+        " You cannot set this arbitrarily, it must be a valid cookie
+        let cookies = cookies . (cookies == "" ? "" : "; ")
+        let cookies = cookies . 'account='.substitute(g:pastie_account,':','%3A','g')
+    endif
+    return cookies
+endfunction
+
+function! s:extractcookies(path)
+    let path = substitute(a:path,'\c^http://'.s:domain,'','')
+    if path !~ '^/'
+        let path = '/'.path
+    endif
+    let cookie = system('ruby -rnet/http -e "print Net::HTTP.get_response(%{'.s:domain.'},%{'.path.'})[%{Set-Cookie}]"')
+    if exists("g:pastie_debug")
+        let g:pastie_cookies_path = path
+        let g:pastie_cookies = cookie
+    endif
+    return s:extractcookiesfromheader(cookie)
+endfunction
+
+function! s:extractcookiesfromheader(cookie)
+    let cookie = a:cookie
+    if cookie !~ '-e:'
+        let session_id = matchstr(cookie,'\<_pastie_session_id=\zs.\{-\}\ze\%([;,]\|$\)')
+        let account    = matchstr(cookie,'\<account=\zs.\{-\}\ze\%([;,]\|$\)')
+        if session_id != ""
+            let g:pastie_session_id = session_id
+        endif
+        if account != ""
+            let g:pastie_account = account
+            let time = matchstr(cookie,'\<[Ee]xpires=\zs\w\w\w,.\{-\}\ze\%([;,]\|$\)')
+            if time != ""
+                let g:pastie_account_expires = system('ruby -e "print Time.parse(%{'.time.'}).to_i"')
+            endif
+        endif
+    endif
+endfunction
+
+function! s:latestid()
+    return system('ruby -rnet/http -e "print Net::HTTP.get_response(URI.parse(%{http://'.s:domain.'/all})).body.match(%r{<a href=.http://'.s:domain.'/(\d+).>View})[1]"')
+endfunction
+
+function! s:urlencode(str)
+    " Vim 6.2, how did we ever live with you?
+    return substitute(substitute(a:str,"[\001-\037%&?=\\\\]",'\="%".printf("%02X",char2nr(submatch(0)))','g'),' ','%20','g')
+endfunction
+
+function! s:newwindow()
+    if !(&modified) && (expand("%") == '' || (version >= 700 && winnr("$") == 1 && tabpagenr("$") == 1))
+        enew
+    else
+        if g:pastie_destination == 'tab'
+            tabnew
+        elseif g:pastie_destination == 'window'
+            new
+        else
+            enew
+        endif
+    endif
+    setlocal noswapfile
+endfunction
+
+" vim:set sw=4 sts=4 et:
diff --git a/.vim/plugin/templates.vim b/.vim/plugin/templates.vim
new file mode 100755
index 0000000..b24dfb5
--- /dev/null
+++ b/.vim/plugin/templates.vim
@@ -0,0 +1,105 @@
+" vim:fileencoding=iso-8859-1
+if has("python")
+py <<EOF
+"""
+	Templates for VIM
+	by Phillip Berndt, www.pberndt.com
+
+	
+	Phillip Berndt, Sat Apr 14 22:20:31 CEST 2007:
+		Nihil (nihil <at> jabber.ccc.de) reported some problems in his
+		VIM environment, which inserts a CR after the first character
+		in templates. He came up with a workaround. Replace the
+		imap command in the end with
+			command('imap <unique> ^D ^[:py template_complete()<CR>a')
+		to make it work.
+
+"""
+import sys
+#sys.path.remove("")
+from vim import *
+from cStringIO import StringIO
+import re, os
+template_buffer = {}
+
+def template_complete():
+	global template_buffer
+
+	# Check for a template
+	currentPos  = current.window.cursor[1]
+	template = ""
+	while currentPos >= 0 and len(current.line) > 0 and not current.line[currentPos].isspace():
+		template = current.line[currentPos] + template 
+		currentPos = currentPos - 1
+	currentPos = currentPos + 1
+	
+	if template is "":
+		return
+	
+	# Search for that template
+	fileType = eval("&ft")
+	if fileType not in template_buffer or template not in template_buffer[fileType]:
+		if fileType not in template_buffer:
+			template_buffer[fileType] = {}
+		searchPath = eval("g:templatePath")
+
+		searchPaths = [
+			"%s/%s/%s" % (searchPath, fileType, template),
+			"%s/%s" % (searchPath, template),
+			"%s/%s/%s.py" % (searchPath, fileType, template),
+			"%s/%s.py" % (searchPath, template)
+			]
+		for templateFile in searchPaths:
+			if not os.access(templateFile, os.F_OK):
+				continue
+			try:
+				if templateFile[-3:] == ".py":
+					template_buffer[fileType][template] = open(templateFile, "r").read()
+				else:
+					template_buffer[fileType][template] = open(templateFile, "r").readlines()
+				break
+			except:
+				continue
+		else:
+			template_buffer[fileType][template] = False
+	if template_buffer[fileType][template] is not False:
+		# Insert template
+		indention = re.search("^\s+", current.line)
+		if indention is None:
+			indention = ""
+		else:
+			indention = indention.group(0)
+		endOfLine = current.line[current.window.cursor[1] + 1:]
+		current.line = current.line[:currentPos]
+		range = current.buffer.range(current.window.cursor[0], current.window.cursor[0])
+
+		if type(template_buffer[fileType][template]) == str:
+			# Execute as python code
+			backup = sys.stdout
+			sys.stdout = StringIO()
+			code = template_buffer[fileType][template]
+			exec code in {}, {"_vim": current, "_command": command}
+			insert = sys.stdout.getvalue().split("\n")
+			sys.stdout = backup
+		else:
+			insert = template_buffer[fileType][template]
+
+		firstLine = True
+		sentVar = False
+		for line in insert:
+			if line.find("<++>") is not -1:
+				sentVar = True
+			if firstLine:
+				range.append(line)
+			else:
+				range.append(indention + line)
+			firstLine = False
+		if sentVar:
+			range.append(endOfLine)
+		else:
+			range.append("<++>%s" % endOfLine)
+		command('normal J')
+
+command('imap <unique>  :py template_complete()<CR>a<C-J>')
+EOF
+endif
diff --git a/.vim/syntax/matlab.vim b/.vim/syntax/matlab.vim
new file mode 100644
index 0000000..4fdce0a
--- /dev/null
+++ b/.vim/syntax/matlab.vim
@@ -0,0 +1,359 @@
+" Vim syntax file
+" Language:	Matlab
+" Maintainer:	Fabrice Guy <fabrice.guy at gmail dot com>
+"		Original authors: Mario Eusebio and Preben Guldberg
+" Last Change:	2008 Oct 16 : added try/catch/rethrow and class statements
+" 		2008 Oct 28 : added highlighting for most of Matlab functions
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn keyword matlabStatement		return function
+syn keyword matlabConditional		switch case else elseif end if otherwise break continue
+syn keyword matlabRepeat		do for while
+syn keyword matlabStorageClass		classdef methods properties events persistent global
+syn keyword matlabExceptions		try catch rethrow throw
+
+syn keyword matlabTodo			contained  TODO NOTE FIXME XXX
+syn keyword matlabImport		import
+" If you do not want these operators lit, uncommment them and the "hi link" below
+syn match  matlabRelationalOperator	"\(==\|\~=\|>=\|<=\|=\~\|>\|<\|=\)"
+syn match matlabArithmeticOperator	"[-+]"
+syn match matlabArithmeticOperator	"\.\=[*/\\^]"
+syn match matlabLogicalOperator		"[&|~]"
+syn keyword matlabBoolean		true false
+
+syn match matlabLineContinuation	"\.\{3}"
+
+" String
+syn region matlabString			start=+'+ end=+'+	oneline
+
+" If you don't like tabs
+syn match matlabTab			"\t"
+
+" Standard numbers
+syn match matlabNumber		"\<\d\+[ij]\=\>"
+" floating point number, with dot, optional exponent
+syn match matlabFloat		"\<\d\+\(\.\d*\)\=\([edED][-+]\=\d\+\)\=[ij]\=\>"
+" floating point number, starting with a dot, optional exponent
+syn match matlabFloat		"\.\d\+\([edED][-+]\=\d\+\)\=[ij]\=\>"
+syn keyword matlabConstant	eps Inf NaN pi
+
+
+" Transpose character and delimiters: Either use just [...] or (...) aswell
+syn match matlabDelimiter		"[][]"
+"syn match matlabDelimiter		"[][()]"
+syn match matlabTransposeOperator	"[])a-zA-Z0-9.]'"lc=1
+
+syn match matlabSemicolon		";"
+
+syn match matlabComment			"%.*$"	contains=matlabTodo,matlabTab
+syn region matlabBlockComment        start=+%{+    end=+%}+
+
+
+" trigonometric
+syn keyword matlabFunc 			acos acosd acosh acot acotd acoth acsc acscd acsch asec asecd asech asin asind asinh
+syn keyword matlabFunc 			atan atan2 atand atanh cos cosd cosh cot cotd coth csc cscd csch hypot sec secd
+syn keyword matlabFunc 			sech sin sind sinh tan tand tanh
+" exponential
+syn keyword matlabFunc 			exp expm1 log log10 log1p log2 nextpow2 nthroot pow2 reallog realpow realsqrt sqrt
+" Complex
+syn keyword matlabFunc 			abs angle complex conj cplxpair  imag real sign unwrap
+" Rounding and Remainder
+syn keyword matlabFunc 			ceil fix floor idivide mod rem round
+"Discrete Math (e.g., Prime Factors)
+syn keyword matlabFunc 			factor factorial gcd isprime lcm nchoosek perms primes rat rats
+"Polynomials
+syn keyword matlabFunc 			conv deconv poly polyder polyeig polyfit polyint polyval polyvalm residue roots
+"Numeric Types
+syn keyword matlabFunc 			arrayfun cast cat class find intmax intmin intwarning ipermute isa isequal isequalwithequalnans isfinite isinf isnan isnumeric isreal isscalar isvector permute realmax realmin reshape squeeze zeros
+"Characters and Strings
+syn keyword matlabFunc 			cellstr char eval findstr isstr regexp sprintf sscanf strcat strcmp strcmpi strings strjust strmatch strread strrep strtrim strvcat
+"Structures
+syn keyword matlabFunc 			cell2struct deal fieldnames getfield  isfield isstruct orderfields rmfield setfield struct struct2cell structfun
+"Cell Arrays
+syn keyword matlabFunc 			cell cell2mat celldisp cellfun cellplot iscell iscellstr mat2cell num2cell
+"Function Handles
+syn keyword matlabFunc 			feval func2str functions str2func
+"Java Classes and Objects
+syn keyword matlabFunc 			clear depfun exist im2java inmem javaaddpath javaArray javachk Generate javaclasspath javaMethod javaObject javarmpath methodsview usejava which
+"Data Type Identification
+syn keyword matlabFunc 			ischar isfloat isinteger isjava islogical isobject validateattributes who whos
+"Data type conversion
+"Numeric
+syn keyword matlabFunc 			double int8 int16 int32 int64 single typecast uint8 uint16 uint32 uint64
+"String to Numeric
+syn keyword matlabFunc 			base2dec bin2dec hex2dec hex2num str2double str2num unicode2native
+"Numeric to String
+syn keyword matlabFunc 			dec2base dec2bin dec2hex int2str mat2str native2unicode num2str
+"Other Conversions
+syn keyword matlabFunc 			datestr logical num2hex str2mat
+"String Creation
+syn keyword matlabFunc 			blanks
+"String Identification
+syn keyword matlabFunc 			isletter isspace isstrprop validatestring 
+"String Manipulation
+syn keyword matlabFunc 			deblank lower upper
+"String Parsing
+syn keyword matlabFunc 			regexpi regexprep regexptranslate strfind strtok 
+"String Evaluation
+syn keyword matlabFunc 			evalc evalin
+"String Comparison
+syn keyword matlabFunc 			strncmp strncmpi
+"Bit-wise Functions
+syn keyword matlabFunc			bitand bitcmp bitget bitmax bitor bitset bitshift bitxor swapbytes
+"Logical Functions
+syn keyword matlabFunc			all and any iskeyword isvarname not or xor
+"Predefined Dialog Boxes
+syn keyword matlabFunc dialog errordlg export2wsdlg helpdlg inputdlg listdlg msgbox printdlg printpreview questdlg uigetdir uigetfile uigetpref uiopen uiputfile uisave uisetcolor uisetfont waitbar warndlg
+"Deploying User Interfaces
+syn keyword matlabFunc guidata guihandles movegui openfig
+"Developing User Interfaces
+syn keyword matlabFunc addpref getappdata getpref ginput guide inspect isappdata ispref rmappdata rmpref setappdata setpref uisetpref waitfor waitforbuttonpress
+"User Interface Objects
+syn keyword matlabFunc uibuttongroup uicontextmenu uicontrol uimenu uipanel uipushtool uitoggletool uitoolbar menu
+"Finding Objects from Callbacks
+syn keyword matlabFunc findall findfigs findobj gcbf gcbo 
+"GUI Utility Functions
+syn keyword matlabFunc align getpixelposition listfonts selectmoveresize setpixelposition textwrap uistack
+"Controlling Program Execution
+syn keyword matlabFunc uiresume uiwait	
+"Basic Plots and Graphs
+syn keyword matlabFunc box errorbar hold  loglog  plot plot3 plotyy polar semilogx semilogy subplot
+"Plotting Tools
+syn keyword matlabFunc figurepalette pan plotbrowser plotedit plottools propertyeditor rotate3d  showplottool zoom 
+
+"Annotating Plots
+syn keyword matlabFunc annotation clabel datacursormode datetick gtext legend  line rectangle texlabel title xlabel ylabel zlabel
+"Area, Bar, and Pie Plots
+syn keyword matlabFunc area bar barh bar3 bar3h pareto pie pie3
+"Contour Plots
+syn keyword matlabFunc contour contour3  contourc contourf ezcontour ezcontourf
+"Direction and Velocity Plots
+syn keyword matlabFunc comet comet3 compass feather quiver quiver3 
+"Discrete Data Plots
+syn keyword matlabFunc stairs stem stem3
+"Function Plots
+syn keyword matlabFunc ezmesh ezmeshc ezplot ezplot3 ezpolar ezsurf ezsurfc fplot 
+"Histograms
+syn keyword matlabFunc hist histc rose
+"Polygons and Surfaces
+syn keyword matlabFunc convhull cylinder delaunay delaunay3 delaunayn dsearch dsearchn ellipsoid fill fill3 inpolygon pcolor  polyarea rectint ribbon slice sphere tsearch tsearchn voronoi waterfall
+"Scatter/Bubble Plots
+syn keyword matlabFunc plotmatrix scatter scatter3
+"Animation
+syn keyword matlabFunc getframe im2frame movie  noanimate
+"Bit-Mapped Images
+syn keyword matlabFunc frame2im image imagesc imfinfo imformats imread imwrite ind2rgb
+"Printing
+syn keyword matlabFunc frameedit hgexport orient print printopt saveas 
+"Handle Graphics
+syn keyword matlabFunc allchild ancestor copyobj delete gca gco get ishandle propedit set
+"Object 
+syn keyword matlabFunc axes figure hggroup hgtransform light patch
+"root object	
+syn keyword matlabFunc surface text
+"Plot Objects
+syn keyword matlabFunc clf close closereq drawnow gcf hgload hgsave newplot opengl refresh
+"Axes Operations
+syn keyword matlabFunc axis cla grid ishold makehgtform
+"Operating on Object Properties
+syn keyword matlabFunc linkaxes linkprop refreshdata
+"Data analysis
+"Basic Operations
+syn keyword matlabFunc brush cumprod cumsum linkdata prod sort sortrows sum 
+"Descriptive Statistics
+syn keyword matlabFunc corrcoef cov max mean median min mode std var
+"Filtering and Convolution
+syn keyword matlabFunc conv2 convn detrend filter filter2 
+"Interpolation and Regression
+syn keyword matlabFunc interp1 interp2 interp3 interpn mldivide mrdivide
+"Fourier Transforms
+syn keyword matlabFunc fft fft2 fftn fftshift fftw ifft ifft2 ifftn ifftshift
+"Derivatives and Integrals
+syn keyword matlabFunc cumtrapz del2 diff gradient trapz 
+"File Operations
+syn keyword matlabFunc cd copyfile dir fileattrib filebrowser isdir lookfor ls matlabroot mkdir movefile pwd recycle rehash rmdir toolboxdir type what
+"Operating System Interface
+syn keyword matlabFunc clipboard computer dos getenv hostid maxNumCompThreads perl setenv system unix winqueryreg
+"MATLAB Version and License
+syn keyword matlabFunc ismac ispc isstudent isunix javachk license prefdir usejava ver verLessThan version 
+"Basic Information
+syn keyword matlabFunc disp display isempty issparse length ndims numel size 
+"Elementary Matrices and Arrays
+syn keyword matlabFunc blkdiag diag eye freqspace ind2sub linspace logspace meshgrid ndgrid ones rand randn sub2ind 
+"Array Operations
+syn keyword matlabFunc accumarray bsxfun cross dot kron tril triu 
+"Array Manipulation
+syn keyword matlabFunc circshift flipdim fliplr flipud horzcat inline repmat rot90 shiftdim vectorize vertcat 
+"Specialized Matrices
+syn keyword matlabFunc compan gallery hadamard hankel hilb invhilb magic pascal rosser toeplitz vander wilkinson
+"Matrix Analysis
+syn keyword matlabFunc cond condeig det norm normest null orth rank rcond rref subspace trace
+"Linear Equations
+syn keyword matlabFunc chol cholinc condest funm ilu inv linsolve lscov lsqnonneg lu luinc pinv qr 
+"Eigenvalues and Singular Values
+syn keyword matlabFunc balance cdf2rdf eig eigs gsvd hess ordeig ordqz ordschur rsf2csf schur sqrtm ss2tf svd svds
+"Matrix Logarithms and Exponentials
+syn keyword matlabFunc expm logm 
+"Factorization
+syn keyword matlabFunc cholupdate planerot qrdelete qrinsert qrupdate qz 
+"Interpolation
+syn keyword matlabFunc griddata griddata3 griddatan interp1q interpft mkpp padecoef pchip ppval spline unmkpp 
+"Delaunay Triangulation and Tessellation
+syn keyword matlabFunc tetramesh trimesh triplot trisurf 
+"Convex Hull
+syn keyword matlabFunc convhulln	
+"Voronoi Diagrams
+syn keyword matlabFunc voronoin
+"Cartesian Coordinate System Conversion
+syn keyword matlabFunc cart2pol cart2sph pol2cart sph2cart 
+"Ordinary Differential Equations (IVP)
+syn keyword matlabFunc decic deval ode15i ode23 ode45 ode113 ode15s ode23s ode23t ode23tb odefile odeget odeset odextend
+"Delay Differential Equations
+syn keyword matlabFunc dde23 ddeget ddesd ddeset 
+"Boundary Value Problems
+syn keyword matlabFunc bvp4c bvp5c bvpget bvpinit bvpset bvpxtend
+"Partial Differential Equations
+syn keyword matlabFunc pdepe pdeval 
+"Optimization
+syn keyword matlabFunc fminbnd fminsearch fzero optimget optimset
+"Numerical Integration (Quadrature)
+syn keyword matlabFunc dblquad quad quadgk quadl quadv triplequad
+"Specialized Math
+syn keyword matlabFunc airy besselh besseli besselj besselk bessely beta betainc betaln ellipj ellipke erf erfc erfcx erfinv erfcinv expint gamma gammainc gammaln legendre psi
+"Elementary Sparse Matrices
+syn keyword matlabFunc spdiags speye sprand sprandn sprandsym
+"Full to Sparse Conversion
+syn keyword matlabFunc full sparse spconvert
+"Working with Sparse Matrices
+syn keyword matlabFunc nnz nonzeros nzmax spalloc spfun spones spparms spy 
+"Reordering Algorithms
+syn keyword matlabFunc amd colamd colperm dmperm ldl randperm symamd symrcm 
+"Linear Algebra
+syn keyword matlabFunc spaugment sprank 
+"Linear Equations (Iterative Methods)
+syn keyword matlabFunc bicg bicgstab cgs gmres lsqr minres pcg qmr symmlq 
+"Tree Operations
+syn keyword matlabFunc etree etreeplot gplot symbfact treelayout treeplot 
+"Timeseries
+"General Purpose
+syn keyword matlabFunc getdatasamplesize getqualitydesc timeseries tsprops tstool
+"Data Manipulation
+syn keyword matlabFunc addsample ctranspose delsample getabstime getinterpmethod getsampleusingtime idealfilter resample setabstime setinterpmethod synchronize transpose
+"Event Data
+syn keyword matlabFunc addevent delevent gettsafteratevent gettsafterevent gettsatevent gettsbeforeatevent gettsbeforeevent  gettsbetweenevents
+"Descriptive Statistics
+syn keyword matlabFunc iqr
+
+"Time Series Collections
+"General Purpose
+syn keyword matlabFunc tscollection
+"Data Manipulation
+syn keyword matlabFunc addsampletocollection addts delsamplefromcollection gettimeseriesnames removets settimeseriesnames
+"Set Functions
+syn keyword matlabFunc intersect ismember issorted setdiff setxor union unique 
+"Date and Time Functions
+syn keyword matlabFunc addtodate calendar clock cputime date datenum datevec eomday etime now weekday
+"M-File Functions and Scripts
+syn keyword matlabFunc addOptional addParamValue addRequired createCopy depdir echo input inputname inputParser mfilename namelengthmax nargchk nargin nargout nargoutchk parse pcode
+"script	Script M-file description
+syn keyword matlabFunc varargin varargout
+"Evaluation of Expressions and Functions
+syn keyword matlabFunc ans assert builtin pause run script symvar
+"Timer Functions
+syn keyword matlabFunc isvalid start startat stop timer timerfind timerfindall wait 
+"Variables and Functions in Memory
+syn keyword matlabFunc assignin datatipinfo genvarname isglobal memory mislocked mlock munlock pack
+"Control Flow
+syn keyword matlabFunc parfor
+"Error Handling
+syn keyword matlabFunc addCause error ferror getReport last lasterr lasterror lastwarn warning
+"Classes and Objects
+syn keyword matlabFunc addlistener addprop dynamicprops 
+"events 	Display class event names
+syn keyword matlabFunc findprop getdisp handle hgsetget inferiorto loadobj metaclass notify saveobj setdisp subsasgn subsindex subsref substruct superiorto 
+"File Name Construction
+syn keyword matlabFunc filemarker fileparts filesep fullfile tempdir tempname 
+"Opening, Loading, Saving Files
+syn keyword matlabFunc daqread filehandle importdata load open save uiimport winopen 
+"Memory Mapping
+syn keyword matlabFunc memmapfile
+"Low-Level File I/O
+syn keyword matlabFunc fclose feof fgetl fgets fopen fprintf fread frewind fscanf fseek ftell fwrite 
+
+"Text Files
+syn keyword matlabFunc csvread csvwrite dlmread dlmwrite textread textscan
+"XML Documents
+syn keyword matlabFunc xmlread xmlwrite xslt
+"Microsoft Excel Functions
+syn keyword matlabFunc xlsfinfo xlsread xlswrite
+"Lotus 1-2-3 Functions
+syn keyword matlabFunc wk1finfo wk1read wk1write
+"Common Data Format (CDF)
+syn keyword matlabFunc cdfepoch cdfinfo cdfread cdfwrite todatenum 
+"Flexible Image Transport System
+syn keyword matlabFunc fitsinfo fitsread 
+"Hierarchical Data Format (HDF)
+syn keyword matlabFunc hdf hdf5 hdf5info hdf5read hdf5write hdfinfo hdfread hdftool 
+"Band-Interleaved Data
+syn keyword matlabFunc multibandread multibandwrite 
+
+
+syn match matlabError	"-\=\<\d\+\.\d\+\.[^*/\\^]"
+syn match matlabError	"-\=\<\d\+\.\d\+[eEdD][-+]\=\d\+\.\([^*/\\^]\)"
+
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_matlab_syntax_inits")
+  if version < 508
+    let did_matlab_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink matlabTransposeOperator	matlabOperator
+  HiLink matlabLineContinuation		Special
+  HiLink matlabLabel			Label
+  HiLink matlabConditional		Conditional
+  HiLink matlabRepeat			Repeat
+  HiLink matlabTodo			Todo
+  HiLink matlabString			String
+  HiLink matlabDelimiter		Identifier
+  HiLink matlabTransposeOther		Identifier
+  HiLink matlabNumber			Number
+  HiLink matlabFloat			Float
+  HiLink matlabConstant			Constant
+  HiLink matlabError			Error
+  HiLink matlabImplicit			matlabStatement
+  HiLink matlabStatement		Statement
+  HiLink matlabSemicolon		SpecialChar
+  HiLink matlabComment			Comment
+  HiLink matlabBlockComment		Comment
+  HiLink matlabImport			Include
+  HiLink matlabBoolean			Boolean
+  HiLink matlabStorageClass		StorageClass
+
+  HiLink matlabArithmeticOperator	matlabOperator
+  HiLink matlabRelationalOperator	matlabOperator
+  HiLink matlabLogicalOperator		matlabOperator
+  HiLink matlabOperator			Operator
+  HiLink matlabExceptions		Exception
+  HiLink matlabFunc			Function
+
+"optional highlighting
+  "HiLink matlabIdentifier		Identifier
+  "HiLink matlabTab			Error
+  delcommand HiLink
+endif
+
+let b:current_syntax = "matlab"
+
+"EOF	vim: ts=8 noet tw=100 sw=8 sts=0
diff --git a/.vim/templates/changelog/change.py b/.vim/templates/changelog/change.py
new file mode 100755
index 0000000..ea0e7ca
--- /dev/null
+++ b/.vim/templates/changelog/change.py
@@ -0,0 +1,3 @@
+import datetime
+print "  %s; Phillip Berndt <phillip.berndt@gmail.com>:" % datetime.date.today().strftime("%d. %b %Y")
+print "  <++>"
diff --git a/.vim/templates/changelog/rel b/.vim/templates/changelog/rel
new file mode 100755
index 0000000..4a4c644
--- /dev/null
+++ b/.vim/templates/changelog/rel
@@ -0,0 +1,2 @@
+* <++>
+<++>
diff --git a/.vim/templates/html/$ b/.vim/templates/html/$
new file mode 100755
index 0000000..86f8609
--- /dev/null
+++ b/.vim/templates/html/$
@@ -0,0 +1 @@
+document.getElementById("<++>").<++>
diff --git a/.vim/templates/html/dl b/.vim/templates/html/dl
new file mode 100755
index 0000000..c7bff2e
--- /dev/null
+++ b/.vim/templates/html/dl
@@ -0,0 +1,6 @@
+<dl>
+	<dt><++></dt>
+	<dd><++></dd>
+	<++>
+</dl>
+<++>
diff --git a/.vim/templates/html/dt b/.vim/templates/html/dt
new file mode 100755
index 0000000..eee603e
--- /dev/null
+++ b/.vim/templates/html/dt
@@ -0,0 +1,3 @@
+<dt><++></dt>
+<dd><++></dd>
+<++>
diff --git a/.vim/templates/html/em b/.vim/templates/html/em
new file mode 100755
index 0000000..53f4852
--- /dev/null
+++ b/.vim/templates/html/em
@@ -0,0 +1 @@
+<em><++></em><++>
diff --git a/.vim/templates/html/form b/.vim/templates/html/form
new file mode 100755
index 0000000..5985979
--- /dev/null
+++ b/.vim/templates/html/form
@@ -0,0 +1,6 @@
+<form method="<++>" action="<++>">
+<p>
+	<++>
+</p>
+</form>
+<++>
diff --git a/.vim/templates/html/html b/.vim/templates/html/html
new file mode 100755
index 0000000..618a876
--- /dev/null
+++ b/.vim/templates/html/html
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC
+	"-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
+
+<html xmlns="http://www.w3.org/1999/xhtml">    
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><+title+></title>
+		<style type="text/css">
+		</style>
+	</head>
+	<body>
+		<h1><+title+></h1>
+		<++>
+	</body>
+</html>
diff --git a/.vim/templates/html/input b/.vim/templates/html/input
new file mode 100755
index 0000000..670e334
--- /dev/null
+++ b/.vim/templates/html/input
@@ -0,0 +1,2 @@
+<input type="<++>" name="<++>" />
+<++>
diff --git a/.vim/templates/html/li b/.vim/templates/html/li
new file mode 100755
index 0000000..b04522c
--- /dev/null
+++ b/.vim/templates/html/li
@@ -0,0 +1,2 @@
+<li><++></li>
+<++>
diff --git a/.vim/templates/html/ol b/.vim/templates/html/ol
new file mode 100755
index 0000000..119e490
--- /dev/null
+++ b/.vim/templates/html/ol
@@ -0,0 +1,5 @@
+<ol>
+	<li><++></li>
+	<++>
+</ol>
+<++>
diff --git a/.vim/templates/html/p b/.vim/templates/html/p
new file mode 100755
index 0000000..92cd897
--- /dev/null
+++ b/.vim/templates/html/p
@@ -0,0 +1,4 @@
+<p>
+	<++>
+</p>
+<++>
diff --git a/.vim/templates/html/script b/.vim/templates/html/script
new file mode 100755
index 0000000..61aab67
--- /dev/null
+++ b/.vim/templates/html/script
@@ -0,0 +1,4 @@
+<script type="text/javascript">
+	<++>
+</script>
+<++>
diff --git a/.vim/templates/html/ul b/.vim/templates/html/ul
new file mode 100755
index 0000000..f65ab78
--- /dev/null
+++ b/.vim/templates/html/ul
@@ -0,0 +1,5 @@
+<ul>
+	<li><++></li>
+	<++>
+</ul>
+<++>
diff --git a/.vim/templates/php/$ b/.vim/templates/php/$
new file mode 100755
index 0000000..86f8609
--- /dev/null
+++ b/.vim/templates/php/$
@@ -0,0 +1 @@
+document.getElementById("<++>").<++>
diff --git a/.vim/templates/php/dl b/.vim/templates/php/dl
new file mode 100755
index 0000000..c7bff2e
--- /dev/null
+++ b/.vim/templates/php/dl
@@ -0,0 +1,6 @@
+<dl>
+	<dt><++></dt>
+	<dd><++></dd>
+	<++>
+</dl>
+<++>
diff --git a/.vim/templates/php/dt b/.vim/templates/php/dt
new file mode 100755
index 0000000..eee603e
--- /dev/null
+++ b/.vim/templates/php/dt
@@ -0,0 +1,3 @@
+<dt><++></dt>
+<dd><++></dd>
+<++>
diff --git a/.vim/templates/php/em b/.vim/templates/php/em
new file mode 100755
index 0000000..53f4852
--- /dev/null
+++ b/.vim/templates/php/em
@@ -0,0 +1 @@
+<em><++></em><++>
diff --git a/.vim/templates/php/fore b/.vim/templates/php/fore
new file mode 100755
index 0000000..5816e79
--- /dev/null
+++ b/.vim/templates/php/fore
@@ -0,0 +1,4 @@
+foreach(<++> as <++> => <++>)
+{
+	<++>
+}
diff --git a/.vim/templates/php/form b/.vim/templates/php/form
new file mode 100755
index 0000000..5985979
--- /dev/null
+++ b/.vim/templates/php/form
@@ -0,0 +1,6 @@
+<form method="<++>" action="<++>">
+<p>
+	<++>
+</p>
+</form>
+<++>
diff --git a/.vim/templates/php/html b/.vim/templates/php/html
new file mode 100755
index 0000000..618a876
--- /dev/null
+++ b/.vim/templates/php/html
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC
+	"-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
+
+<html xmlns="http://www.w3.org/1999/xhtml">    
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><+title+></title>
+		<style type="text/css">
+		</style>
+	</head>
+	<body>
+		<h1><+title+></h1>
+		<++>
+	</body>
+</html>
diff --git a/.vim/templates/php/input b/.vim/templates/php/input
new file mode 100755
index 0000000..670e334
--- /dev/null
+++ b/.vim/templates/php/input
@@ -0,0 +1,2 @@
+<input type="<++>" name="<++>" />
+<++>
diff --git a/.vim/templates/php/li b/.vim/templates/php/li
new file mode 100755
index 0000000..b04522c
--- /dev/null
+++ b/.vim/templates/php/li
@@ -0,0 +1,2 @@
+<li><++></li>
+<++>
diff --git a/.vim/templates/php/ol b/.vim/templates/php/ol
new file mode 100755
index 0000000..119e490
--- /dev/null
+++ b/.vim/templates/php/ol
@@ -0,0 +1,5 @@
+<ol>
+	<li><++></li>
+	<++>
+</ol>
+<++>
diff --git a/.vim/templates/php/p b/.vim/templates/php/p
new file mode 100755
index 0000000..92cd897
--- /dev/null
+++ b/.vim/templates/php/p
@@ -0,0 +1,4 @@
+<p>
+	<++>
+</p>
+<++>
diff --git a/.vim/templates/php/script b/.vim/templates/php/script
new file mode 100755
index 0000000..61aab67
--- /dev/null
+++ b/.vim/templates/php/script
@@ -0,0 +1,4 @@
+<script type="text/javascript">
+	<++>
+</script>
+<++>
diff --git a/.vim/templates/php/ul b/.vim/templates/php/ul
new file mode 100755
index 0000000..f65ab78
--- /dev/null
+++ b/.vim/templates/php/ul
@@ -0,0 +1,5 @@
+<ul>
+	<li><++></li>
+	<++>
+</ul>
+<++>
diff --git a/.vim/templates/php/while b/.vim/templates/php/while
new file mode 100755
index 0000000..0e6e202
--- /dev/null
+++ b/.vim/templates/php/while
@@ -0,0 +1,4 @@
+while(<++>)
+{
+	<++>
+}
diff --git a/.vim/templates/python/fori b/.vim/templates/python/fori
new file mode 100755
index 0000000..4fb67c9
--- /dev/null
+++ b/.vim/templates/python/fori
@@ -0,0 +1,2 @@
+for <++> in <++>:
+	<++>
diff --git a/.vim/templates/python/gtkt b/.vim/templates/python/gtkt
new file mode 100755
index 0000000..c8a62c1
--- /dev/null
+++ b/.vim/templates/python/gtkt
@@ -0,0 +1,3 @@
+gtk.threads_enter()
+<++>
+gtk.threads_leave()
diff --git a/.vim/templates/python/head b/.vim/templates/python/head
new file mode 100755
index 0000000..5567fe9
--- /dev/null
+++ b/.vim/templates/python/head
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+# vim:fileencoding=utf-8:ft=python
+#
+
diff --git a/.vim/templates/tex/head b/.vim/templates/tex/head
new file mode 100644
index 0000000..572c2d0
--- /dev/null
+++ b/.vim/templates/tex/head
@@ -0,0 +1,23 @@
+\documentclass{scrartcl}
+\usepackage{graphicx}
+\usepackage[utf8]{inputenc}
+\usepackage[ngerman]{babel}
+\usepackage[automark]{scrpage2}
+\pagestyle{scrheadings}
+
+\ihead{<+links+>}
+\chead{\pagemark}
+\ohead{\headmark}
+\author{Phillip Berndt}
+\date{\today{}}
+\title{<++>}
+
+
+\begin{document}
+\maketitle
+\tableofcontents
+\newpage
+
+\section{<++>}
+
+\end{document}
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..81d40f5
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,83 @@
+set background=light
+
+"if &columns < 100
+"	set columns=100
+"end
+"if &lines < 35
+"	set lines=35
+"end
+
+" basics
+set nocompatible        " use vim defaults
+set mouse=a             " make sure mouse is used in all cases.
+set fileformat=unix     " force unix-style line breaks
+set tabpagemax=30       " maximum number of tabs
+" tabs and indenting
+"set expandtab           " insert spaces instead of tab chars
+set tabstop=4          " a n-space tab width
+set shiftwidth=4        " allows the use of < and > for VISUAL indenting
+set softtabstop=0       " counts n spaces when DELETE or BCKSPCE is used
+set fileencoding=utf-8
+
+if has("autocmd")
+  filetype plugin indent on " indents behaviour depends on type
+else
+  set autoindent        " auto indents next new line
+endif
+  
+" searching
+set nohlsearch          " dont highlight all search results
+set incsearch           " increment search
+set ignorecase          " case-insensitive search
+set smartcase           " upper-case sensitive search
+
+" formatting
+set backspace=2         " full backspacing capabilities
+set history=100         " 100 lines of command line history
+set cmdheight=1         " command line height
+set laststatus=1        " occasions to show status line, 2=always.
+set ruler               " ruler display in status line
+set showmode            " show mode at bottom of screen
+set showcmd             " display some infos (in visual)
+set number              " show line numbers
+set nobackup            " disable backup files (filename~)
+set showmatch           " show matching brackets (),{},[]
+set ww=<,>,[,]          " whichwrap -- left/right keys can traverse up/down
+
+" syntax highlighting
+syntax on               " enable syntax highlighting
+
+" set templatepath .vim/plugin/templates.vim 
+let g:templatePath = "/home/ben/.vim/templates"
+
+" highlight redundant whitespaces and tabs.
+"highlight RedundantSpaces ctermbg=red guibg=red
+"match RedundantSpaces /\s\+$\| \+\ze\t\|\t/
+
+" gvim settings
+"set guioptions-=T" Disable toolbar icons
+set guifont=Dejavu\ Sans\ Mono\ 10 " backslash spaces
+"set lines=30
+"set columns=95
+
+" F5 toggles spell checking
+:map <F5> :setlocal spell! spelllang=de_de<cr>
+:imap <F5> <C-o>:setlocal spell! spelllang=de_de<cr>
+
+" common save shortcuts ~ dont work with vim :(
+"inoremap <C-s> <esc>:w<cr>a
+"nnoremap <C-s> :w<cr>
+
+" Mapping for Copy/Paste
+map <C-x> "+x
+map <C-y> "+y
+map <C-p> "+p
+" enter ex mode with semi-colon
+nnoremap ; :
+vnoremap ; :
+
+" strip ^M linebreaks from dos formatted files
+map M :%s/
$//g
+
+" mutt rules
+au BufRead /tmp/mutt-* set tw=72 spell