diff --git a/bin/socks5_on_1080.sh b/bin/socks5_on_1080.sh
deleted file mode 100755
index a4cf1ce..0000000
--- a/bin/socks5_on_1080.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ssh -f -N -D 192.168.0.3:1080 yerevak.vostan.org
diff --git a/config/.gitconfig b/config/.gitconfig
index 71f9342..537d598 100644
--- a/config/.gitconfig
+++ b/config/.gitconfig
@@ -23,3 +23,5 @@
 	path = ~/.gitconfig.local
 [core]
 	excludesfile = ~/.gitignore.global
+[credentail]
+	helper = cache
diff --git a/vim/vimrc b/vim/vimrc
index bdd781b..5a247fa 100755
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -427,6 +427,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:airline#extensions#tabline#left_sep = ' '
     let g:airline#extensions#tabline#left_alt_sep = '|'
     let g:airline_powerline_fonts = 1
+
     "
     "
     "
@@ -461,7 +462,6 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:buffergator_viewport_split_policy = "L"
     map ab :BuffergatorToggle<CR>
     "map at :BuffergatorTabsToggle<CR>
-
     "
     " :A switches to the header file (or vise versa)
     " :AS splits and switches
@@ -483,6 +483,11 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     let g:alternateExtensions_cpp = "h"
     let g:alternateExtensions_c = "h"
     map ah :A<CR>
+
+    "
+    "   Tmux integration.
+    "
+    Plugin 'benmills/vimux'
     "
     "   Extends modeline to variables.
     "   Needed by CF5 compile to read options right from file.
@@ -495,7 +500,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     Plugin 'vishap/cf5-compile'
     map <silent> ac :call CF5CompileOnly()<CR>
     map <silent> ar :call CF5CompileAndRun()<CR>
-    
+
     "
     "   Provide templates
     "
@@ -552,6 +557,7 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
 
     "
     "   Nice colorschemes.
+    "   Actual colorscheme is set outside as vundle resets it.
     "
     if &t_Co >= 256 || has('gui_running')
         Plugin 'nanotech/jellybeans.vim'
@@ -604,6 +610,9 @@ if filereadable(expand('~/.vim/bundle/Vundle.vim/README.md'))
     filetype plugin on
 endif
 
+"
+"   Vundle resets this if set inside vundle section.
+"
 if &t_Co >= 256 || has('gui_running')
     colorscheme jellybeans
     hi clear SpellBad