diff --git a/.gitconfig b/.gitconfig
index c4b1140..c37bd7b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,15 @@
   email = mikecampo@gmail.com
 [merge]
   summary = true
+  tool = vimdiff
+[core]
+	editor = /usr/bin/vim
+[push]
+	default = tracking
+[github]
+	user = mikecampo
+[diff]
+	algorithm = patience
 [color]
   diff = auto
   status = auto
@@ -57,12 +66,6 @@
   pom = push origin master
   ds = diff --stat=160,120
   dh1 = diff HEAD~1
-
-[merge]
-  tool = vimdiff
-[core]
-	editor = /usr/bin/vim
-[push]
-	default = tracking
-[github]
-	user = mikecampo
+  snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
+  ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
+  theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
diff --git a/.tmux.conf b/.tmux.conf
index a049fd2..f53a9df 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,6 +1,6 @@
 # enable pbcopy and pbpaste
 # https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard/blob/master/README.md
-#set-option -g default-command "reattach-to-user-namespace -l zsh"
+set-option -g default-command "reattach-to-user-namespace -l zsh"
 
 # enable pretty colors
 set -g default-terminal "screen-256color"
@@ -45,6 +45,8 @@ bind \ split-window -h
 unbind '"'
 bind - split-window -v
 
+bind C-x kill-window
+
 # resize panes
 bind -r H resize-pane -L 5
 bind -r J resize-pane -D 5
diff --git a/.vimrc b/.vimrc
index b0d6513..27f1c6f 100644
--- a/.vimrc
+++ b/.vimrc
@@ -81,6 +81,8 @@ set wildignore+=*/tmp/*,*/log/*,*.so,*.swp,*.zip,*/rdoc/*
 set colorcolumn=90
 " Show trailing whitespace
 set list listchars=tab:»·,trail:·
+" Adding this since the esc remap on the 'i' key had a long delay when pressed
+set timeoutlen=300 ttimeoutlen=0
 
 " Fix vim's background colour erase - http://snk.tuxfamily.org/log/vim-256color-bce.html
 if &term =~ '256color'