Just in case you wanted to see/take any of these changes

git/.gitconfig

@@ -4,8 +4,8 @@
 [hub]
         protocol = https
 [user]
-        name = Chris Seto
-        email = chriskseto@gmail.com
+        name = Fabian von Feilitzsch
+        email = fabian@fabianism.us
 [credential]
         helper = osxkeychain
 [alias]

tmux/.tmux.conf

@@ -92,21 +92,15 @@ bind + select-layout main-horizontal
 ############
 
 # Toggle mouse on
+unbind m
 bind m \
-    set -g mode-mouse on \;\
-    set -g mouse-resize-pane on \;\
-    set -g mouse-select-pane on \;\
-    set -g mouse-select-window on \;\
+    set-option -g -q mouse on \;\
+    bind-key -T root WheelUpPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; copy-mode -e; send-keys -M" \;\
+    bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M" "select-pane -t =; send-keys -M" \;\
+    bind-key -t vi-copy WheelUpPane halfpage-up \;\
+    bind-key -t vi-copy WheelDownPane halfpage-down \;\
     display 'Mouse: ON'
 
-# Toggle mouse off
-bind M \
-    set -g mode-mouse off \;\
-    set -g mouse-resize-pane off \;\
-    set -g mouse-select-pane off \;\
-    set -g mouse-select-window off \;\
-    display 'Mouse: OFF'
-
 # Navigate panes
 ################
 

vim/.vimrc

@@ -9,6 +9,19 @@ autocmd bufwritepost .vimrc source $MYVIMRC
 call plug#begin()
 
 " ESSENTIALS
+Plug 'fabianvf/pytest.vim'
+nmap <silent><Leader>tF :Pytest file verbose<CR>
+nmap <silent><Leader>tc :Pytest class verbose<CR>
+nmap <silent><Leader>tm :Pytest method verbose<CR>
+nmap <silent><Leader>tf :Pytest function verbose<CR>
+nmap <silent><Leader>tdF :Pytest file verbose doctest<CR>
+nmap <silent><Leader>tdc :Pytest class verbose doctest<CR>
+nmap <silent><Leader>tdm :Pytest method verbose doctest<CR>
+nmap <silent><Leader>tdf :Pytest function verbose doctest<CR>
+
+Plug 'bling/vim-airline'
+let g:airline#extensions#hunks#enabled = 0
+Plug 'christoomey/vim-tmux-navigator'
 
 Plug 'tpope/vim-sensible'
 Plug 'rstacruz/vim-opinion'
@@ -70,16 +83,16 @@ Plug 'alfredodeza/khuno.vim'
 
 " NICE TO HAVE
 
-Plug 'bling/vim-airline'
-let g:airline_theme='tomorrow'
+" Plug 'bling/vim-airline'
+" let g:airline_theme='tomorrow'
 " Show buffers in tabline
-let g:airline#extensions#tabline#enabled = 1
+" let g:airline#extensions#tabline#enabled = 1
 " Disable stuff I don't need to see
-let g:airline#extensions#hunks#enabled = 0
-let g:airline#extensions#bufferline#enabled = 1
-let g:airline#extensions#tagbar#enabled = 0
-let g:airline#extensions#virtualenv#enabled = 0
-let g:airline#extensions#csv#enabled = 0
+" let g:airline#extensions#hunks#enabled = 0
+" let g:airline#extensions#bufferline#enabled = 1
+" let g:airline#extensions#tagbar#enabled = 0
+" let g:airline#extensions#virtualenv#enabled = 0
+" let g:airline#extensions#csv#enabled = 0
 Plug 'christoomey/vim-tmux-navigator'
 
 Plug 'SirVer/ultisnips'
@@ -177,6 +190,33 @@ if executable('npm')
   " Rename with <C-c>rr (also like in python-mode)
   autocmd Filetype javascript noremap <buffer> <C-c>r :TernRename<CR>
 endif
+Plug 'sophacles/vim-bundle-mako'
+Plug 'plasticboy/vim-markdown'
+let g:vim_markdown_folding_disabled=1
+
+" Idris stuff
+Plug 'idris-hackers/idris-vim'
+
+Plug 'ZoomWin'
+Plug 'terryma/vim-multiple-cursors'
+" For previewing markdown, rst ,etc
+Plug 'greyblake/vim-preview'
+Plug 'matchit.zip'
+Plug 'duff/vim-scratch'
+" Open scratch buffer with space-tab
+command! ScratchToggle call ScratchToggle()
+
+function! ScratchToggle()
+    if exists("w:is_scratch_window")
+        unlet w:is_scratch_window
+        exec "q"
+    else
+        exec "normal! :Sscratch\<cr>\<C-W>L"
+        let w:is_scratch_window = 1
+    endif
+endfunction
+
+nnoremap <silent> <leader><tab> :ScratchToggle<cr>
 
 call plug#end()
 filetype plugin indent on
@@ -198,13 +238,20 @@ set softtabstop=4 " when hitting <BS>, pretend like a tab is removed, even if sp
 set shiftwidth=4 " number of spaces to use for autoindenting
 set shiftround " use multiple of shiftwidth when indenting with '<' and '>'
 
+
 " No bells
 set noerrorbells visualbell t_vb=
 """ VISUAL SETTINGS """
 
 set t_Co=256 " Must be 256 for many themes to display correctly
 " Favorites: hybrid iceberg Tomorrow hybrid-light
 silent! colorscheme hybrid
+" May want to have different schemes for termvim vs gvim
+" if has('gui_running')
+"     silent! colorscheme emacs
+" else
+"     silent! colorscheme underwater
+" endif
 
 " Show trailing whitespace
 set list listchars=tab:▸\ ,trail:▫
@@ -352,3 +399,15 @@ if has('gui_running')
         set go-=L
     endif
 endif
+
+function! NumberToggle()
+  if(&relativenumber == 1)
+    set norelativenumber
+    set number
+  else
+    set relativenumber
+    set number
+  endif
+endfunc
+
+nnoremap <C-n> :call NumberToggle()<cr>

zsh/.zpreztorc

@@ -34,7 +34,6 @@ zstyle ':prezto:load' pmodule \
   'completion' \
   'prompt' \
   'osx' \
-  'git' \
   'python'
 
 #

zsh/.zshrc

@@ -1,4 +1,29 @@
 #!/usr/bin/env zsh
+# shortcut to this dotfiles path is $ZSH
+export ZSH=$HOME/.dotfiles
+export ANSIBLE_NOCOWS=1
+export PATH=$PATH:~/scripts:~/.cabal/bin
+export EDITOR='vim'
+export OSF=~/code/cos/osf.io
+export SCRAPI=~/code/cos/scrapi
+export GOPATH=$HOME/go
+export PATH=$PATH:$GOPATH/bin
+export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python
+alias ansalon='telnet ansalonmud.net 8679'
+
+source ~/dotfiles/tmux/tmuxinator.zsh
+
+alias g='git'
+alias gssh='SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh && ssh'
+alias c='clear'
+alias query_share='curl -XPOST localhost:9200/share/_search\?pretty -d @query.json'
+alias mkpasswd='python -c "from passlib.hash import sha512_crypt; import getpass; print sha512_crypt.encrypt(getpass.getpass())"'
+# use .localrc for SUPER SECRET CRAP that you don't
+# want in your public, versioned repo.
+if [[ -a ~/.localrc ]]
+then
+  source ~/.localrc
+fi
 
 # Source Prezto.
 if [[ -s "${ZDOTDIR:-$HOME}/.zprezto/init.zsh" ]]; then
@@ -10,6 +35,44 @@ autoload -U compinit
 compinit
 
 # Make autoenv always work
+cd .
+# fortune -o -s -n 300 | cowsay -f dragon-and-cow | lolcat
+
+[[ -s $(brew --prefix)/etc/autojump.sh ]] && . $(brew --prefix)/etc/autojump.sh
+
+
+export WORKON_HOME=~/Envs
+source /usr/local/bin/virtualenvwrapper.sh
+source /usr/local/opt/autoenv/activate.sh
+
+pyclean () {
+        ZSH_PYCLEAN_PLACES=${*:-'.'}
+        noglob find ${ZSH_PYCLEAN_PLACES} -type f -name "*.py[co]" -delete
+        noglob find ${ZSH_PYCLEAN_PLACES} -type d -name "__pycache__" -delete
+}
+
+# added by travis gem
+[ -f /Users/fabian/.travis/travis.sh ] && source /Users/fabian/.travis/travis.sh
+
+# Show git branch
+setopt prompt_subst
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' actionformats \
+    '%F{5}(%f%s%F{5})%F{3}-%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f '
+zstyle ':vcs_info:*' formats       \
+    '%F{4}%s%F{3}%F{2}:%F{4}%F{2}%b%F{5}%f '
+zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r'
+
+zstyle ':vcs_info:*' enable git cvs svn
+
+# or use pre_cmd, see man zshcontrib
+vcs_info_wrapper() {
+  vcs_info
+  if [ -n "$vcs_info_msg_0_" ]; then
+    echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del"
+  fi
+}
+RPROMPT=$'$(vcs_info_wrapper)'
 # cd .
 #
 function colours() {
@@ -44,7 +107,7 @@ DISABLE_CORRECTION="true"
 unsetopt correct
 unsetopt correct_all
 
-. ~/.bin/z.sh
+# . ~/.bin/z.sh
 
 alias py="python"
 alias py3="python3"