From 6c02c553273e06aed177b111d5fba1bdc783438d Mon Sep 17 00:00:00 2001
From: Ben Orenstein <ben.orenstein@gmail.com>
Date: Sat, 4 Oct 2014 14:59:21 -0400
Subject: [PATCH] Minor changes. Commit message skipped.

---
 zsh/aliases   | 2 +-
 zsh/functions | 2 +-
 zshrc         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/zsh/aliases b/zsh/aliases
index efcc77ab04..8780cc6b63 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -90,7 +90,7 @@ alias retag='ctags -R --exclude=.svn --exclude=.git --exclude=log --exclude=tmp
 alias retagwithcoffee='ctags -R --exclude=.svn --exclude=.git --exclude=log --exclude=tmp * && coffeetags -R -f >> tags'
 alias repush="gpr && git push"
 alias review="git diff master"
-alias rc='rails console'
+alias rc='bin/rails console'
 alias remigrate='rake db:migrate && rake db:migrate:redo && rake db:schema:dump && rake db:test:prepare'
 alias rdm="bin/rake db:migrate"
 alias rdtp="bin/rake db:test:prepare"
diff --git a/zsh/functions b/zsh/functions
index 6b77860af6..44da6c297c 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -9,7 +9,7 @@ function git_branch_name {
 
 function git-done {
   branch=`git_branch_name`
-  killruby ; spring stop ; git checkout master && git merge $branch --ff-only && bundle install && rake db:migrate db:test:prepare && rake && git push && git branch -D $branch && git push origin :$branch
+  killruby ; spring stop ; git checkout master && git merge $branch --ff-only && bundle install &&  prepdb && bin/rspec && git push && git branch -D $branch && git push origin :$branch
 }
 
 function git-nuke {
diff --git a/zshrc b/zshrc
index 423615dea1..e3e7d31fe1 100644
--- a/zshrc
+++ b/zshrc
@@ -26,5 +26,7 @@ stty stop undef
 source $HOME/.dotfiles/zsh/aliases
 source $HOME/.dotfiles/zsh/functions
 source $HOME/.dotfiles/zsh/prompt
+source $HOME/.dotfiles/zsh/z
 
 export PATH=$PATH:bin:~/bin:/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/local/git/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/.rvm/bin
+