diff --git a/home/.gitconfig b/home/.gitconfig
index a4bf978..befd4b6 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -2,7 +2,7 @@
 	name = Jerome Foray
 	email = meroje.f@gmail.com
 [core]
-	excludesfile = ~/.gitignore_global
+	excludesfile = /Users/meroje/.gitignore_global
     editor = $EDITOR
     page = tig
 [pager]
@@ -84,6 +84,7 @@
 	brr     = !git br -r
 	brn     = !git bra --no-merged
 	cb      = checkout -b
+	co      = checkout
 	pwd     = rev-parse --abbrev-ref HEAD
 
 	# Status
@@ -121,11 +122,13 @@
 	# https://github.com/defunkt/gist
 	gist    = !gist
 [difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	cmd = /usr/local/bin/ksdiff -w \"$LOCAL\" \"$REMOTE\"
 	path = 
 [mergetool "sourcetree"]
-	cmd = /usr/local/Cellar/sourcetree/1.5.4/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	cmd = /usr/local/bin/ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true
 [mergetool "Kaleidoscope"]
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
 	trustExitCode = true
+[remote "origin"]
+	fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
diff --git a/home/.tmux-powerline b/home/.tmux-powerline
index efce30a..988bc06 160000
--- a/home/.tmux-powerline
+++ b/home/.tmux-powerline
@@ -1 +1 @@
-Subproject commit efce30ae5b8112d5f48fa5a8fde8f19305a60113
+Subproject commit 988bc06946029fbeb55d245231050e51b5848b08
diff --git a/home/.tmux-powerlinerc b/home/.tmux-powerlinerc
index 638439d..2736c7d 100644
--- a/home/.tmux-powerlinerc
+++ b/home/.tmux-powerlinerc
@@ -123,5 +123,5 @@
 	# 1. Go to Yahoo weather http://weather.yahoo.com/
 	# 2. Find the weather for you location
 	# 3. Copy the last numbers in that URL. e.g. "http://weather.yahoo.com/united-states/california/newport-beach-12796587/" has the numbers "12796587"
-	export TMUX_POWERLINE_SEG_WEATHER_LOCATION="612876"
+	export TMUX_POWERLINE_SEG_WEATHER_LOCATION="627791"
 # }
diff --git a/home/.zprezto b/home/.zprezto
index 0e31224..38bfc97 160000
--- a/home/.zprezto
+++ b/home/.zprezto
@@ -1 +1 @@
-Subproject commit 0e3122415ef3f54cbb44d0c07b5f4cbf13c6c3fd
+Subproject commit 38bfc97267916adfe16061b3e61038bb1582e522