Merge branch 'master' of https://git.asgard.bitvalve.org/mschoengens/dotconfigs

tmux/tmux.conf

@@ -1 +1,5 @@
-set-option -g prefix C-t
+set-option -g prefix C-t
+set-option -g allow-rename off
+set-window-option -g allow-rename off 
+bind-key h swap-window -t -1
+bind-key l swap-window -t +1

zsh/zshrc

@@ -116,6 +116,7 @@ SAVEHIST=$HISTSIZE
 ### Generic Setup
 export LC_ALL='en_US.UTF-8'
 export WORKON_HOME=~/.virtualenvs
+export EDITOR=vim
 
 if [[ $(uname) = "Darwin" ]]; then
     PATH=$PATH:~/Library/Anaconda/bin