diff --git a/.hgsub b/.hgsub
index 986b309..f508f43 100644
--- a/.hgsub
+++ b/.hgsub
@@ -18,3 +18,4 @@ bundle/git_gitgutter = [git]https://github.com/airblade/vim-gitgutter.git
 bundle/git_vim-javascript = [git]https://github.com/pangloss/vim-javascript.git 
 bundle/git_vim-nodejs-complete = [git]https://github.com/myhere/vim-nodejs-complete.git 
 bundle/git_fugitive = [git]https://github.com/tpope/vim-fugitive.git
+bundle/git_markdown = [git]https://github.com/hallison/vim-markdown.git
diff --git a/.hgsubstate b/.hgsubstate
index 8fd756e..0ce839a 100644
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -2,18 +2,19 @@
 efdfd226575ab0ee4ad01c822b3e80d3a090e4d4 bundle/ft_git_pydoc
 28747f3a246312f03c79110c1b7f84e1d47cde8a bundle/ft_git_pyflakes-vim
 f183a345a0c10caed7684d07dabae33e007c7590 bundle/git_ack
-bf72f81769380d7f6328b84615032cc6a16be489 bundle/git_calendar
+d2d081da62acabff87176713660645737a543262 bundle/git_calendar
 c1646e3c28d75bcc834af4836f4c6e12296ba891 bundle/git_ctrlp
 f6d93b8788b57990a2669b2408004c0086d6a878 bundle/git_fugitive
-6889f9918ef1348f81bab8032726e44ffdd2cc57 bundle/git_gitgutter
+60ce94c03bca7cd18149ad10cbf496e895502410 bundle/git_gitgutter
 4c376a8061fa335228da420937ce385b847dd56a bundle/git_gundo
+10073c3a3c363c34681c2e37ae29e9675e2cde90 bundle/git_markdown
 0b3d928dce8262dedfc2f83b9aeb59a94e4f0ae4 bundle/git_nerdcommenter
 a81bef76031ca1c71766b516417480caeb01c932 bundle/git_repeat
 02199ea0080d744ec76b79d74ce56d51d25cf7ae bundle/git_surround
-75a234231ba0c43883e0a84c48caf3acc1229a0e bundle/git_syntastic
-cc222f5d8c22825af2906453ebe3833dfa670689 bundle/git_tagbar
+8480de81af9566331e2371bee536c2f9990f7f0d bundle/git_syntastic
+dec1f840fb226f6d42b0d4200e8485e64fadaa2a bundle/git_tagbar
 73e67619cd3b8de34608a0e410e580587d6bcfea bundle/git_taglisttoo
-971778b93a4a46a27477935b4f4a2568c778e884 bundle/git_ultisnips
+79b4baa3acf079af89d6118a11821a62babe0f6a bundle/git_ultisnips
 bffbab0357b89fed164dbe114649c9d82993ee1a bundle/git_vcscommand
-6049b8f79a23d391ff6d6712efd4ab551f8df51a bundle/git_vim-javascript
+f07cc6708f628260f442a62d4af655e80b8a9589 bundle/git_vim-javascript
 1e2f98f4366c6dec27fa8df72971fa9fa33e9f07 bundle/git_vim-nodejs-complete
diff --git a/.vimrc b/.vimrc
index 101c82e..8d40745 100644
--- a/.vimrc
+++ b/.vimrc
@@ -208,6 +208,13 @@ let g:python_version_2=1
 let g:languagetool_jar='/opt/LanguageTool/LanguageTool.jar'
 "let g:languagetool_lang=pl
 "}}}
+"Jedi {{{
+" automatically popup is annoying
+let g:jedi#popup_on_dot = 0
+" also this one is pretty annoying
+let g:jedi#show_function_definition = "0"
+"let g:languagetool_lang=pl
+"}}}
 "}}}
 "KEYS: User defined keyboard shortcuts {{{
 
@@ -410,13 +417,13 @@ if has('gui_running')
     " I like this font, but it looks like crap on linux
     "set guifont=Consolas\ 12  
     " at least, some ttf font that looks good
-    set guifont=DejaVu\ Sans\ Mono\ 12
+    "set guifont=DejaVu\ Sans\ Mono\ 12
     " Unfortunately there is a problem with TTF fonts in my gvim instance.  
     " After editing a while there are some leaving trash appearing on the
     " buffer. Refreshing the screen helps, but is kinda annoying. It is 
     " probably my X11 setup, because on other similar workstations and setup I 
     " didn't noticed such behavior. Fallback to fixed-misc for a while.
-    "set guifont=Fixed\ 14
+    set guifont=Fixed\ 14
     set mouse=a                "Enable mouse support
     " No toolbar, menu, scrollbars, draw simple text tabs. This would keep
     " window in one place, and also this will conserve space. Tabs are huge
diff --git a/UltiSnips/python.snippets b/UltiSnips/python.snippets
index f0e5c88..b826efc 100644
--- a/UltiSnips/python.snippets
+++ b/UltiSnips/python.snippets
@@ -42,4 +42,8 @@ window.wm_withdraw()  # make window invisible. we only want message boxes
 ttk.Style().theme_use('clam')
 tkMessageBox.showinfo(title="${1:title}", message="${2:msg}", parent=window)
 endsnippet
+
+snippet _ "Dunder completion"
+__${1:init}__$0
+endsnippet
 # vim:ft=snippets:
diff --git a/UltiSnips/rst.snippets b/UltiSnips/rst.snippets
index afc44a1..9913ad5 100644
--- a/UltiSnips/rst.snippets
+++ b/UltiSnips/rst.snippets
@@ -38,7 +38,7 @@ snippet copyright
 :Copyright: ${1:}
 endsnippet
 
-snippet rights reST tag
+snippet rights "reST tag"
 :Rights: ${1:}
 endsnippet