merge repository

.gitmodules

@@ -52,6 +52,9 @@
 [submodule ".vim/bundle/syntastic"]
 	path = .vim/bundle/syntastic
 	url = git://github.com/scrooloose/syntastic.git
+[submodule ".vim/bundle/vimrepress"]
+	path = .vim/bundle/vimrepress
+	url = git://github.com/vim-scripts/VimRepress.git
 [submodule ".vim/bundle/vim-markdown"]
 	path = .vim/bundle/vim-markdown
 	url = git://github.com/tpope/vim-markdown.git

.vimrc

@@ -173,7 +173,7 @@ nnoremap g, g,zz
 nnoremap <c-left> 5<c-w>>
 nnoremap <c-right> 5<c-w><
 
-"switch between windows with leader key 
+"switch between windows with Ctl + hjkl 
 noremap <C-h> <C-w>h
 noremap <C-j> <C-w>j
 noremap <C-k> <C-w>k
@@ -313,7 +313,7 @@ augroup ft_python
 
     " au FileType python setlocal omnifunc=pythoncomplete#Complete
     au FileType python setlocal define=^\s*\\(def\\\\|class\\)
-    au FileType python compiler nose
+    "au FileType python compiler nose
     au FileType man nnoremap <buffer> <cr> :q<cr>
     
     " Jesus tapdancing Christ, built-in Python syntax, you couldn't let me
@@ -389,6 +389,11 @@ let g:rbpt_colorpairs = [
 let g:rbpt_max = 16
 
 
+" }}}
+" vimpress {{{
+if filereadable($HOME.'/vimrepressrc')
+    source $HOME/vimrepressrc
+endif 
 " }}}
 " Markdown {{{
 

README

@@ -21,12 +21,19 @@ How to install command-t
 3. in windows , follow the steps here: http://rfbrazier.posterous.com/installing-the-command-t-vim-plugin-on-window
 4. go to ruby/command-t
 5. ruby extconf.rb
-<<<<<<< HEAD
 6. make
 
 Ctags.exe in windows
 1. Download ctags from http://ctags.sourceforge.net/
 2. put ctags.exe in $HOME/ctags
 =======
-6. make
->>>>>>> 2ff0cb14f7a25c177e20d5fcd816491616f43c7f
+Vimpress setup
+1. create a file in your $HOME folder called 'vimrepressrc'
+2. Enter your blog information:
+let VIMPRESS = [{'username':'user',
+                \'password':'pass',
+                \'blog_url':'http://your-first-blog.com/'
+                \},
+                \{'username':'user',
+                 \'blog_url':'http://your-second-blog.com/'
+                \}]