diff --git a/zsh/aliases b/zsh/aliases
index 7febd7a..7801aa8 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -27,22 +27,28 @@ alias be='bundle exec'
 alias beg='bundle exec guard'
 alias bower='noglob bower'
 alias bu='bundle update'
+alias bo='bundle open'
 alias cls=clear
 alias code='cd ~/code'
 alias cpr='cp -r'
 alias d='dart'
+alias da='dartanalyzer'
+alias dc='dart --checked'
+alias dd='dartdoc'
 alias dot='cd ~/.dotfiles'
 alias dr='cd ~/Dropbox'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/zsh/functions'
 alias f='fg'
 alias history='fc -l 1'
+alias histroy='history'
 alias h='heroku'
 alias irb='irb --readline -r irb/completion'
 alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
 alias rb='rbenv'
+alias rbg='rbenv gemset active'
 alias rbp='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")'
 alias rbl='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")/lib/ruby'
 alias rg='rails generate'
@@ -103,8 +109,12 @@ alias gmffs='git merge --ff-only --squash'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
 alias gpd='git push && git push heroku master'
+alias gpdf='gpf && gphf'
 alias gpp='git push && git push production HEAD:production'
+alias gppp='git push production'
+alias gppf='gpf && git push production HEAD:production -f'
 alias gph='git push heroku master'
+alias gphf='git push heroku master --force'
 alias gpf='git push -f'
 alias gpu='git push -u'
 alias gpff='git pull --ff-only'
@@ -124,7 +134,8 @@ alias gref='git reflog'
 alias grev='git remote -v'
 alias grm='git rm'
 alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"'
-alias gshow='git show'
+alias gshow='echo "use gsh instead!"'
+alias gsh='git show'
 alias gst='git status'
 alias gs='git stash'
 alias gss='git stash save'
@@ -159,8 +170,9 @@ alias pcg='cd ~/code/work/pcg'
 alias cur='cd ~/code/projects/things'
 
 # Work
-alias pcgt='vim ~/code/work/pcg/docs/time-tracker.txt'
-alias pcgn='vim ~/code/work/pcg/docs/personal-notes.txt'
+alias pcgt='vim ~/code/work/pcg/files/time-tracker.txt'
+alias pcgn='vim ~/code/work/pcg/files/personal-notes.txt'
+alias pcgf='cd ~/code/work/pcg/files'
 
 # Open Source
 alias ssh-discourse='ssh -F ~/code/projects/discourse/.project/vagrant.ssh.conf default'
diff --git a/zshrc b/zshrc
index 1f55abb..e3b9f0f 100644
--- a/zshrc
+++ b/zshrc
@@ -27,7 +27,7 @@ export TERM=xterm-256color
 export EDITOR=vi
 
 # Grep tweaks
-export GREP_OPTIONS="-nRi --color --exclude-dir=.git --exclude-dir=vendor --exclude-dir=tmp --exclude-dir=public --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage" # --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
+export GREP_OPTIONS="-nRi --color --exclude-dir=.git  --exclude-dir=tmp --exclude-dir=public --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage --exclude-dir=.bundle" # --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
 
 # Save a ton of history
 export HISTSIZE=20000
@@ -65,7 +65,9 @@ export RBENV_PATH="$HOME/.rbenv"
 export PATH="$RBENV_PATH/bin:$PATH"
 eval "$(rbenv init -)"
 
-export RUBY_HEAP_MIN_SLOTS=1000000
+export RUBY_HEAP_MIN_SLOTS=1000000 # for < 2.1.1, will raise warning when using 2.1.1
+export RUBY_GC_HEAP_INIT_SLOTS=1000000 # for 2.1.1
+
 export RUBY_HEAP_SLOTS_INCREMENT=1000000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_GC_MALLOC_LIMIT=1000000000