--- a/.hgsub Thu Jan 27 10:33:56 2011 -0500
+++ b/.hgsub Thu Jan 27 17:02:43 2011 -0500
@@ -7,6 +7,6 @@
vim/bundle/nerdtree = [git]git://github.com/scrooloose/nerdtree.git
vim/sadness/sparkup = [git]git://github.com/sjl/sparkup.git
vim/bundle/surround = [git]git://github.com/tpope/vim-surround.git
-vim/bundle/syntastic = [git]git://github.com/scrooloose/syntastic.git
+vim/bundle/syntastic = [git]git://github.com/sjl/syntastic.git
vim/bundle/vim-coffee-script = [git]git://github.com/kchmck/vim-coffee-script.git
vim/bundle/vim-javascript = [git]git://github.com/pangloss/vim-javascript.git
--- a/.hgsubstate Thu Jan 27 10:33:56 2011 -0500
+++ b/.hgsubstate Thu Jan 27 17:02:43 2011 -0500
@@ -6,7 +6,7 @@
930be32a23e902ddc46135ddbb9e76b0fac0c14b vim/bundle/nerdcommenter
7650cdc6621cd15b047dc04605b8b0bc0396564d vim/bundle/nerdtree
27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
-4b690ba5e20fd603986df9563614909442b4086c vim/bundle/syntastic
+60731769663ea23b4763f3f0034da445ebcd3ddd vim/bundle/syntastic
b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
c2df2e430d7d5fe645aa40e36079ab51f082e06b vim/bundle/vim-javascript
94293727a5d47cb3cca3a32069f86eb42cbc0bf6 vim/sadness/sparkup
--- a/vim/.vimrc Thu Jan 27 10:33:56 2011 -0500
+++ b/vim/.vimrc Thu Jan 27 17:02:43 2011 -0500
@@ -171,6 +171,9 @@
au BufNewFile,BufRead *.vim setlocal foldmethod=marker
+au FileType python,man map <buffer> <localleader>d :call ShowPyDoc('<C-R><C-W>', 1)<CR>
+au FileType python,man map <buffer> <localleader>D :call ShowPyDoc('<C-R><C-A>', 1)<CR>
+
au BufNewFile,BufRead urls.py setlocal nowrap
au BufNewFile,BufRead settings.py normal! zR
au BufNewFile,BufRead dashboard.py normal! zR
--- a/vim/colors/clouds.vim Thu Jan 27 10:33:56 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-" Vim color file
-" Converted from Textmate theme Clouds using Coloration v0.2.4 (http://github.com/sickill/coloration)
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let g:colors_name = "Clouds"
-
-hi Cursor guifg=NONE guibg=#000000 gui=NONE
-hi Visual guifg=NONE guibg=#bdd5fc gui=NONE
-hi CursorLine guifg=NONE guibg=#fffbd1 gui=NONE
-hi CursorColumn guifg=NONE guibg=#fffbd1 gui=NONE
-hi LineNr guifg=#808080 guibg=#ffffff gui=NONE
-hi VertSplit guifg=#cfcfcf guibg=#cfcfcf gui=NONE
-hi MatchParen guifg=#af956f guibg=NONE gui=NONE
-hi StatusLine guifg=#000000 guibg=#cfcfcf gui=bold
-hi StatusLineNC guifg=#000000 guibg=#cfcfcf gui=NONE
-hi Pmenu guifg=NONE guibg=NONE gui=NONE
-hi PmenuSel guifg=NONE guibg=#bdd5fc gui=NONE
-hi IncSearch guifg=NONE guibg=#e5dccf gui=NONE
-hi Search guifg=NONE guibg=#e5dccf gui=NONE
-hi Directory guifg=NONE guibg=NONE gui=NONE
-hi Folded guifg=#bcc8ba guibg=#ffffff gui=NONE
-
-hi Normal guifg=#000000 guibg=#ffffff gui=NONE
-hi Boolean guifg=#39946a guibg=NONE gui=NONE
-hi Character guifg=NONE guibg=NONE gui=NONE
-hi Comment guifg=#bcc8ba guibg=NONE gui=NONE
-hi Conditional guifg=#af956f guibg=NONE gui=NONE
-hi Constant guifg=NONE guibg=NONE gui=NONE
-hi Define guifg=#af956f guibg=NONE gui=NONE
-hi ErrorMsg guifg=NONE guibg=#ff002a gui=NONE
-hi WarningMsg guifg=NONE guibg=#ff002a gui=NONE
-hi Float guifg=#46a609 guibg=NONE gui=NONE
-hi Function guifg=NONE guibg=NONE gui=NONE
-hi Identifier guifg=#c52727 guibg=NONE gui=NONE
-hi Keyword guifg=#af956f guibg=NONE gui=NONE
-hi Label guifg=#5d90cd guibg=NONE gui=NONE
-hi NonText guifg=#bfbfbf guibg=#fffbd1 gui=NONE
-hi Number guifg=#46a609 guibg=NONE gui=NONE
-hi Operator guifg=#484848 guibg=NONE gui=NONE
-hi PreProc guifg=#af956f guibg=NONE gui=NONE
-hi Special guifg=#000000 guibg=NONE gui=NONE
-hi SpecialKey guifg=#bfbfbf guibg=#fffbd1 gui=NONE
-hi Statement guifg=#af956f guibg=NONE gui=NONE
-hi StorageClass guifg=#c52727 guibg=NONE gui=NONE
-hi String guifg=#5d90cd guibg=NONE gui=NONE
-hi Tag guifg=#606060 guibg=NONE gui=NONE
-hi Title guifg=#000000 guibg=NONE gui=bold
-hi Todo guifg=#bcc8ba guibg=NONE gui=inverse,bold
-hi Type guifg=NONE guibg=NONE gui=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline
-hi rubyClass guifg=#af956f guibg=NONE gui=NONE
-hi rubyFunction guifg=NONE guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol guifg=NONE guibg=NONE gui=NONE
-hi rubyConstant guifg=NONE guibg=NONE gui=NONE
-hi rubyStringDelimiter guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyBlockParameter guifg=NONE guibg=NONE gui=NONE
-hi rubyInstanceVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyInclude guifg=#af956f guibg=NONE gui=NONE
-hi rubyGlobalVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyRegexp guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyRegexpDelimiter guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyEscape guifg=NONE guibg=NONE gui=NONE
-hi rubyControl guifg=#af956f guibg=NONE gui=NONE
-hi rubyClassVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyOperator guifg=#484848 guibg=NONE gui=NONE
-hi rubyException guifg=#af956f guibg=NONE gui=NONE
-hi rubyPseudoVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyRailsUserClass guifg=NONE guibg=NONE gui=NONE
-hi rubyRailsARAssociationMethod guifg=#c52727 guibg=NONE gui=NONE
-hi rubyRailsARMethod guifg=#c52727 guibg=NONE gui=NONE
-hi rubyRailsRenderMethod guifg=#c52727 guibg=NONE gui=NONE
-hi rubyRailsMethod guifg=#c52727 guibg=NONE gui=NONE
-hi erubyDelimiter guifg=#c52727 guibg=NONE gui=NONE
-hi erubyComment guifg=#bcc8ba guibg=NONE gui=NONE
-hi erubyRailsMethod guifg=#c52727 guibg=NONE gui=NONE
-hi htmlTag guifg=NONE guibg=NONE gui=NONE
-hi htmlEndTag guifg=NONE guibg=NONE gui=NONE
-hi htmlTagName guifg=NONE guibg=NONE gui=NONE
-hi htmlArg guifg=NONE guibg=NONE gui=NONE
-hi htmlSpecialChar guifg=#bf78cc guibg=NONE gui=NONE
-hi javaScriptFunction guifg=#c52727 guibg=NONE gui=NONE
-hi javaScriptRailsFunction guifg=#c52727 guibg=NONE gui=NONE
-hi javaScriptBraces guifg=NONE guibg=NONE gui=NONE
-hi yamlKey guifg=#606060 guibg=NONE gui=NONE
-hi yamlAnchor guifg=NONE guibg=NONE gui=NONE
-hi yamlAlias guifg=NONE guibg=NONE gui=NONE
-hi yamlDocumentHeader guifg=#5d90cd guibg=NONE gui=NONE
-hi cssURL guifg=NONE guibg=NONE gui=NONE
-hi cssFunctionName guifg=#c52727 guibg=NONE gui=NONE
-hi cssColor guifg=#bf78cc guibg=NONE gui=NONE
-hi cssPseudoClassId guifg=#606060 guibg=NONE gui=NONE
-hi cssClassName guifg=#c52727 guibg=NONE gui=NONE
-hi cssValueLength guifg=#46a609 guibg=NONE gui=NONE
-hi cssCommonAttr guifg=#bf78cc guibg=NONE gui=NONE
-hi cssBraces guifg=NONE guibg=NONE gui=NONE
\ No newline at end of file
--- a/vim/colors/cloudsm.vim Thu Jan 27 10:33:56 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-" Vim color file
-" Converted from Textmate theme Clouds Midnight using Coloration v0.2.4 (http://github.com/sickill/coloration)
-
-set background=dark
-highlight clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let g:colors_name = "Clouds Midnight"
-
-hi Cursor guifg=NONE guibg=#7da5dc gui=NONE
-hi Visual guifg=NONE guibg=#000000 gui=NONE
-hi CursorLine guifg=NONE guibg=#1f1f1f gui=NONE
-hi CursorColumn guifg=NONE guibg=#1f1f1f gui=NONE
-hi ColorColumn guifg=NONE guibg=#1f1f1f gui=NONE
-hi LineNr guifg=#565656 guibg=#191919 gui=NONE
-hi VertSplit guifg=#303030 guibg=#303030 gui=NONE
-hi MatchParen guifg=#927c5d guibg=NONE gui=NONE
-hi StatusLine guifg=#929292 guibg=#303030 gui=bold
-hi StatusLineNC guifg=#929292 guibg=#303030 gui=NONE
-hi Pmenu guifg=NONE guibg=NONE gui=NONE
-hi PmenuSel guifg=NONE guibg=#000000 gui=NONE
-hi IncSearch guifg=NONE guibg=#413a2f gui=NONE
-hi Search guifg=NONE guibg=#413a2f gui=NONE
-hi Directory guifg=NONE guibg=NONE gui=NONE
-hi Folded guifg=#3c403b guibg=#191919 gui=NONE
-
-hi Normal guifg=#929292 guibg=#191919 gui=NONE
-hi Boolean guifg=#39946a guibg=NONE gui=NONE
-hi Character guifg=NONE guibg=NONE gui=NONE
-hi Comment guifg=#3c403b guibg=NONE gui=NONE
-hi Conditional guifg=#927c5d guibg=NONE gui=NONE
-hi Constant guifg=NONE guibg=NONE gui=NONE
-hi Define guifg=#927c5d guibg=NONE gui=NONE
-hi ErrorMsg guifg=#ffffff guibg=#e92e2e gui=NONE
-hi WarningMsg guifg=#ffffff guibg=#e92e2e gui=NONE
-hi Float guifg=#46a609 guibg=NONE gui=NONE
-hi Function guifg=NONE guibg=NONE gui=NONE
-hi Identifier guifg=#e92e2e guibg=NONE gui=NONE
-hi Keyword guifg=#927c5d guibg=NONE gui=NONE
-hi Label guifg=#5d90cd guibg=NONE gui=NONE
-hi NonText guifg=#333333 guibg=NONE gui=NONE
-hi Number guifg=#46a609 guibg=NONE gui=NONE
-hi Operator guifg=#4b4b4b guibg=NONE gui=NONE
-hi PreProc guifg=#927c5d guibg=NONE gui=NONE
-hi Special guifg=#929292 guibg=NONE gui=NONE
-hi SpecialKey guifg=#bfbfbf guibg=#1f1f1f gui=NONE
-hi Statement guifg=#927c5d guibg=NONE gui=NONE
-hi StorageClass guifg=#e92e2e guibg=NONE gui=NONE
-hi String guifg=#5d90cd guibg=NONE gui=NONE
-hi Tag guifg=#606060 guibg=NONE gui=NONE
-hi Title guifg=#929292 guibg=NONE gui=bold
-hi Todo guifg=#3c403b guibg=NONE gui=inverse,bold
-hi Type guifg=NONE guibg=NONE gui=NONE
-hi Underlined guifg=NONE guibg=NONE gui=underline
-hi rubyClass guifg=#927c5d guibg=NONE gui=NONE
-hi rubyFunction guifg=NONE guibg=NONE gui=NONE
-hi rubyInterpolationDelimiter guifg=NONE guibg=NONE gui=NONE
-hi rubySymbol guifg=NONE guibg=NONE gui=NONE
-hi rubyConstant guifg=NONE guibg=NONE gui=NONE
-hi rubyStringDelimiter guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyBlockParameter guifg=NONE guibg=NONE gui=NONE
-hi rubyInstanceVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyInclude guifg=#927c5d guibg=NONE gui=NONE
-hi rubyGlobalVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyRegexp guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyRegexpDelimiter guifg=#5d90cd guibg=NONE gui=NONE
-hi rubyEscape guifg=NONE guibg=NONE gui=NONE
-hi rubyControl guifg=#927c5d guibg=NONE gui=NONE
-hi rubyClassVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyOperator guifg=#4b4b4b guibg=NONE gui=NONE
-hi rubyException guifg=#927c5d guibg=NONE gui=NONE
-hi rubyPseudoVariable guifg=NONE guibg=NONE gui=NONE
-hi rubyRailsUserClass guifg=NONE guibg=NONE gui=NONE
-hi rubyRailsARAssociationMethod guifg=#e92e2e guibg=NONE gui=NONE
-hi rubyRailsARMethod guifg=#e92e2e guibg=NONE gui=NONE
-hi rubyRailsRenderMethod guifg=#e92e2e guibg=NONE gui=NONE
-hi rubyRailsMethod guifg=#e92e2e guibg=NONE gui=NONE
-hi erubyDelimiter guifg=#e92e2e guibg=NONE gui=NONE
-hi erubyComment guifg=#3c403b guibg=NONE gui=NONE
-hi erubyRailsMethod guifg=#e92e2e guibg=NONE gui=NONE
-hi htmlTag guifg=NONE guibg=NONE gui=NONE
-hi htmlEndTag guifg=NONE guibg=NONE gui=NONE
-hi htmlTagName guifg=NONE guibg=NONE gui=NONE
-hi htmlArg guifg=NONE guibg=NONE gui=NONE
-hi htmlSpecialChar guifg=#a165ac guibg=NONE gui=NONE
-hi javaScriptFunction guifg=#e92e2e guibg=NONE gui=NONE
-hi javaScriptRailsFunction guifg=#e92e2e guibg=NONE gui=NONE
-hi javaScriptBraces guifg=NONE guibg=NONE gui=NONE
-hi yamlKey guifg=#606060 guibg=NONE gui=NONE
-hi yamlAnchor guifg=NONE guibg=NONE gui=NONE
-hi yamlAlias guifg=NONE guibg=NONE gui=NONE
-hi yamlDocumentHeader guifg=#5d90cd guibg=NONE gui=NONE
-hi cssURL guifg=NONE guibg=NONE gui=NONE
-hi cssFunctionName guifg=#e92e2e guibg=NONE gui=NONE
-hi cssColor guifg=#a165ac guibg=NONE gui=NONE
-hi cssPseudoClassId guifg=#606060 guibg=NONE gui=NONE
-hi cssClassName guifg=#e92e2e guibg=NONE gui=NONE
-hi cssValueLength guifg=#46a609 guibg=NONE gui=NONE
-hi cssCommonAttr guifg=#a165ac guibg=NONE gui=NONE
-hi cssBraces guifg=NONE guibg=NONE gui=NONE
--- a/vim/colors/mustang.vim Thu Jan 27 10:33:56 2011 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-" Maintainer: Henrique C. Alves (hcarvalhoalves@gmail.com)
-" Version: 1.0
-" Last Change: September 25 2008
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "mustang"
-
-" Vim >= 7.0 specific colors
-if version >= 700
- hi CursorLine guibg=#2d2d2d ctermbg=236
- hi ColorColumn guibg=#2d2d2d ctermbg=236
- hi CursorColumn guibg=#2d2d2d ctermbg=236
- hi MatchParen guifg=#d0ffc0 guibg=#2f2f2f gui=bold ctermfg=157 ctermbg=237 cterm=bold
- hi Pmenu guifg=#ffffff guibg=#444444 ctermfg=255 ctermbg=238
- hi PmenuSel guifg=#000000 guibg=#b1d631 ctermfg=0 ctermbg=148
-endif
-
-" General colors
-hi Cursor guifg=NONE guibg=#626262 gui=none ctermbg=241
-hi Normal guifg=#e2e2e5 guibg=#202020 gui=none ctermfg=253 ctermbg=234
-hi NonText guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=235
-hi LineNr guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=232
-hi StatusLine guifg=#d3d3d5 guibg=#444444 gui=italic ctermfg=253 ctermbg=238 cterm=italic
-hi StatusLineNC guifg=#939395 guibg=#444444 gui=none ctermfg=246 ctermbg=238
-hi VertSplit guifg=#444444 guibg=#444444 gui=none ctermfg=238 ctermbg=238
-hi Folded guifg=#a0a8b0 guibg=#202020 gui=none ctermbg=4 ctermfg=248
-hi Title guifg=#f6f3e8 guibg=NONE gui=bold ctermfg=254 cterm=bold
-hi Visual guifg=#faf4c6 guibg=#3c414c gui=none ctermfg=254 ctermbg=4
-hi SpecialKey guifg=#808080 guibg=#202020 gui=none ctermfg=244 ctermbg=236
-
-" Syntax highlighting
-hi Comment guifg=#808080 gui=italic ctermfg=244
-hi Todo guifg=#8f8f8f gui=italic ctermfg=245
-hi Boolean guifg=#b1d631 gui=none ctermfg=148
-hi String guifg=#b1d631 gui=italic ctermfg=148
-hi Identifier guifg=#b1d631 gui=none ctermfg=148
-hi Function guifg=#ffffff gui=bold ctermfg=255
-hi Type guifg=#7e8aa2 gui=none ctermfg=103
-hi Statement guifg=#7e8aa2 gui=none ctermfg=103
-hi Keyword guifg=#ff9800 gui=none ctermfg=208
-hi Constant guifg=#ff9800 gui=none ctermfg=208
-hi Number guifg=#ff9800 gui=none ctermfg=208
-hi Special guifg=#ff9800 gui=none ctermfg=208
-hi PreProc guifg=#faf4c6 gui=none ctermfg=230
-hi Todo guifg=#000000 guibg=#e6ea50 gui=italic
-
-" Code-specific colors
-hi pythonOperator guifg=#7e8aa2 gui=none ctermfg=103
-