gitconfig updates and iterm2

.gitconfig

@@ -31,8 +31,9 @@
 
 [alias]
     fancy-log  = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(cyan)<%an>%Creset' --abbrev-commit --date=relative
-    branches = for-each-ref --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:iso8601) %(color:white)%(objectname:short) %09%(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads
+    branches = for-each-ref --sort='-authordate:iso8601' --format=' %(color:green)%(authordate:iso8601) %(color:white)%(objectname:short) %09%(color:yellow)%(refname:short) %09%(color:white)%(upstream:track) %(contents:subject)' refs/heads --no-merged
     edit-conflicted = ! git diff --name-only | uniq | xargs subl
 [core]
 	editor = subl -w
 	excludesfile = ~/.gitignore-global
+	whitespace = tab-in-indent,trailing-space,space-before-tab

.zshrc

@@ -89,3 +89,6 @@ else
   export EDITOR='subl'
 fi
 
+export PATH="/usr/local/sbin:$PATH"
+
+test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"