From 6c1663505dccc8d2c2aa179c41037cb51145ab60 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 10 Apr 2014 01:08:32 -0700
Subject: [PATCH] emacs.d pointer bump, small tmux.conf changes.

---
 dotfiles/emacs.d   | 2 +-
 dotfiles/tmux.conf | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dotfiles/emacs.d b/dotfiles/emacs.d
index 9336a670..80834324 160000
--- a/dotfiles/emacs.d
+++ b/dotfiles/emacs.d
@@ -1 +1 @@
-Subproject commit 9336a6700d1c01f782efec87ce02a066e182cd28
+Subproject commit 80834324ebb10a1ebe4617930b70c8f9b6ae362f
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
index 0db9bd67..3d04d7cd 100644
--- a/dotfiles/tmux.conf
+++ b/dotfiles/tmux.conf
@@ -1,5 +1,11 @@
+unbind C-o
+set -g prefix C-b
+bind-key C-b send-prefix
+
 set-option -g status on
 bind-key @ command-prompt -p "create pane from:"  "join-pane -s ':%%'"
+bind-key ^ command-prompt -p "swap window:"  "swap-pane -s '%%' -t '%%'"
+
 set-option -g status-interval 2
 set-option -g status-utf8 on
 set-option -g status-justify "centre"