diff --git a/.gitconfig b/.gitconfig
index d65eba8..fd6cd2d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,31 @@
 [user]
 	name = Brian Bland
 	email = brian.bland@docker.com
+[log]
+	decorate = true
+[push]
+	default = simple
+[branch]
+	autosetuprebase = always
+[color]
+	ui = true
+[color "branch"]
+	current = yellow reverse
+	local = yellow
+	remote = green
+[color "diff"]
+	meta = yellow
+	frag = cyan bold
+	old = red bold
+	new = green bold
+[color "status"]
+	added = yellow
+	changed = green
+	untracked = cyan
+[log]
+	decorate = short
+[alias]
+	rma = !git ls-files -d | xargs git rm
+	glog = log --all --date-order --graph --format=\"%C(yellow bold)%h %C(cyan bold)%an%C(red bold)%d%Creset %s %C(green bold)%N%Creset\"
+	wdiff = diff --color-words
+	track = !git branch -u origin/$(git symbolic-ref --short HEAD)
diff --git a/.zshrc b/.zshrc
index 5214fe1..b632d90 100644
--- a/.zshrc
+++ b/.zshrc
@@ -145,6 +145,7 @@ compinit
 
 #export GOROOT=/usr/local/Cellar/go/1.1.2
 export GOPATH=$HOME/code/go
+PATH=$GOPATH/bin:$PATH
 
 boot2docker shellinit > /dev/null 2>&1 && $(boot2docker shellinit)
 
@@ -156,3 +157,5 @@ PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 
 export STACKER_WORKSPACE=/Users/bbland/code/docker
+
+export PATH