diff --git a/.bashrc.kuba b/.bashrc.kuba
index 841945e..2022e7b 100755
--- a/.bashrc.kuba
+++ b/.bashrc.kuba
@@ -43,7 +43,7 @@ source_existing ~/.bash_prompt.kuba
 source_existing ~/.python-venv.kuba/bin/activate
 
 if command -v ipython &> /dev/null; then
-    alias p=ipython
+    alias p=ipython --pylab
 elif command -v python &> /dev/null; then
     alias p=python
 fi
diff --git a/.modules.kuba/.tools.sh b/.modules.kuba/.tools.sh
index 8b8f571..b8d7317 100644
--- a/.modules.kuba/.tools.sh
+++ b/.modules.kuba/.tools.sh
@@ -108,3 +108,18 @@ pdftoclipboard() {
 
     pdftoppm -png -r "$dpi" "$file"  | xclip -sel clip -t image/png -i
 }
+
+gitgrepsed() {
+    if [ $# -lt 2 ]; then
+        echo "Usage gitgrepsed SEARCH REPLACE
+
+Search and replace in git repository.
+Alias for git grep -l \$SEARCH | xargs sed -i "s/\$SEARCH/\$REPLACE/g"
+        "
+        return
+    fi
+
+    search="$1"
+    replace="$2"
+    git grep -l "$search" | xargs sed -i "s/$search/$replace/g"
+}
diff --git a/.modules.kuba/tools.lua b/.modules.kuba/tools.lua
index 0f67961..0c53466 100644
--- a/.modules.kuba/tools.lua
+++ b/.modules.kuba/tools.lua
@@ -7,5 +7,6 @@ local loadscript = pathJoin(path, '.' .. myModuleName() .. '.sh');
 
 execute{cmd='source ' .. loadscript, modeA={"load"}}
 execute{cmd='unset -f npz_preview npz_previewi ' ..
-            'rsync_wrap rsync_wrap_huge selc selv cliipc clipv watch_modify pdftoclipboard' ..
+            'rsync_wrap rsync_wrap_huge selc selv cliipc clipv watch_modify pdftoclipboard gitgrepsed' ..
+            'rsync_wrap rsync_wrap_huge selc selv cliipc clipv watch_modify' ..
             ';', modeA={"unload"}}
diff --git a/.ssh/config b/.ssh/config
index b8487f4..c19f2ed 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -15,13 +15,8 @@ Host aino
   User jakub
   Port 22209
 
-Host tahoe
-  HostName tahoe.fy.chalmers.se
-  User jakub
-  Port 22209
-
 Host sharknado
-  HostName 130.239.81.182
+  HostName 130.238.29.144
   User ubuntu
   IdentityFile ~/.ssh/jupyterhub_rsa
 
diff --git a/.vimrc b/.vimrc
index 0a9d6ca..8604c30 100755
--- a/.vimrc
+++ b/.vimrc
@@ -36,6 +36,7 @@ if filereadable(expand(vundle_dir) . "/README.md")
     Plugin 'tell-k/vim-autopep8'
     Plugin 'jpalardy/vim-slime'
     Plugin 'preservim/tagbar'
+    Plugin 'wellle/context.vim'
 
     call vundle#end()            " required
 else
@@ -343,6 +344,10 @@ nmap <F2> :NERDTreeToggle<CR>
 nmap <F3> :NERDTreeFind<CR>
 map <F5> :call CurtineIncSw()<CR>
 
+let g:context_enabled = 0
+map <F6> :ContextToggle<CR>
+map cp :ContextPeek<CR>
+
 " Julialang
 let g:latex_to_unicode_auto = 1