Merge branch 'master' of fucktheforce.de:xeno

vim/vimrc

@@ -5,7 +5,7 @@ colorscheme vitamins
 set tw=0
 set sw=4
 set ts=4
-set expandtab
+""set expandtab
 set ls=0
 set number
 set noerrorbells

zsh/zshrc

@@ -31,6 +31,7 @@ export DEBEMAIL=xeno@thehappy.de
 export DEBFULLNAME="Stefan Ritter"
 export QUILT_PATCHES=debian/patches
 export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
+export EDITOR="vim"
 
 HISTSIZE=1000
 SAVEHIST=1000