diff --git a/home/.gitconfig b/home/.gitconfig
index 9e64175..40e370b 100644
--- a/home/.gitconfig
+++ b/home/.gitconfig
@@ -17,8 +17,10 @@
 [diff]
 	tool = Kaleidoscope
 [core]
-	excludesfile = /Users/hungerandthirst/.gitignore_global
+	excludesfile = ~/.gitignore_global
 	editor = subl -w
+	autocrlf = false
+	ignorecase = true
 [color]
 	ui = true
 [alias]
@@ -28,7 +30,10 @@
 	enabled = 1
 [mergetool "Kaleidoscope"]
 	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true
 [mergetool]
 	prompt = false
 [merge]
 	tool = Kaleidoscope
+[credential]
+	helper = osxkeychain
diff --git a/home/.gitignore_global b/home/.gitignore_global
index 109227b..06e5df5 100644
--- a/home/.gitignore_global
+++ b/home/.gitignore_global
@@ -4,6 +4,7 @@
 build/
 .powrc
 .gems
+.bundle
 
 .cookbooks
 .chef
diff --git a/home/.zshrc b/home/.zshrc
index eac69ff..64b1f07 100644
--- a/home/.zshrc
+++ b/home/.zshrc
@@ -12,13 +12,8 @@ bindkey -e
 
 COMPLETION_WAITING_DOTS=true
 JRUBY_INVOCATION="$(readlink "$(which celerity_jruby)")"
-<<<<<<< Updated upstream
-export JRUBY_OPTS="--1.9"
-PATH="$HOME/.rbenv/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
-=======
-export JRUBY_OPTS=--1.9
+JRUBY_OPTS="--1.9"
 PATH="$HOME/.rbenv/bin:$HOME/bin:/usr/local/bin:/usr/local/sbin/:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/share/npm/bin:$PATH"
->>>>>>> Stashed changes
 TZ="America/New_York"
 HISTFILE=$HOME/.zhistory
 HISTSIZE=1000
@@ -26,16 +21,15 @@ SAVEHIST=1000
 HOSTNAME="`hostname`"
 PAGER='less'
 
-<<<<<<< Updated upstream
-alias edit=subl
-=======
 alias edit="subl"
->>>>>>> Stashed changes
 export EDITOR="subl -w"
 
 # alias edit=vim
 # export EDITOR=edit
 
+# git go: https://github.com/pengwynn/dotfiles/blob/master/bin/git-go
+GH_LOGIN=plukevdh
+
 #LANGUAGE=
 LC_ALL='en_US.UTF-8'
 LANG='en_US.UTF-8'
@@ -59,14 +53,10 @@ FLEX_HOME='~/Code/Flex/flex_sdk_3.4.1'
 # zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
 # zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
 
-<<<<<<< Updated upstream
 fpath=(/usr/local/share/zsh-completions $fpath)
 [[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh"
-
-eval "$(rbenv init -)"
-=======
-[[ -s "$HOME/.nvm/nvm.sh" ]] && . "$HOME/.nvm/nvm.sh"  # This loads RVM into a shell session.
-
 eval "$(rbenv init -)"
 eval "$(hub alias -s)"
->>>>>>> Stashed changes
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"