diff --git a/zsh/aliases b/zsh/aliases
index 1b6757f..136d62d 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -19,11 +19,11 @@ alias cd.....='cd ../../../..'
 alias ls='ls -G'
 
 alias aliases='vim ~/.dotfiles/zsh/aliases'
+alias al='aliases'
 alias b='bundle'
-alias bake='bundle exec rake'
 alias be='bundle exec'
 alias bi='bundle install'
-alias be='bundle exec'
+alias br='bundle exec rake'
 alias beg='bundle exec guard'
 alias bl='brew link --overwrite'
 alias bld='brew link --overwrite --dry-run'
@@ -47,10 +47,19 @@ alias gems='cd ~/pcg/gems'
 alias history='fc -l 1'
 alias histroy='history'
 alias h='heroku'
+alias ho='heroku open'
+alias hca='heroku config:add'
 alias irb='irb --readline -r irb/completion'
+alias li='lineman'
+alias lir='lineman run'
+alias lib='lineman build'
+alias lig='lineman grunt'
+alias lis='lineman spec'
+alias lic='lineman spec-ci'
 alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
+alias rr='bundle exec rake release'
 alias rb='rbenv'
 alias rbg='rbenv gemset active'
 alias rbp='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")'
@@ -79,6 +88,7 @@ alias zsh='vim ~/.zshrc'
 # Git
 alias ammend='amend'
 alias amend='git commit --amend'
+alias amends='git commit -S --amend'
 alias g='gst'
 alias ga='git add -A :/'
 alias gaa='git add -A'
@@ -87,10 +97,13 @@ alias gb='git branch'
 alias gbd='git branch -D'
 alias gbl='git branch --all'
 alias gc='git commit'
+alias gcs='git commit -S'
 alias gcl='git clone'
 alias gcm="git commit -m"
+alias gcms="git commit -S -m"
 alias gco='git checkout'
 alias gcob='git checkout -b'
+alias gcon='vi .git/config'
 alias gcp='git cherry-pick'
 alias gcps='git cherry-pick -n'
 alias gd='git diff'
@@ -100,6 +113,7 @@ alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
 alias gf='git fetch'
 alias gfix="ga && git commit -a --amend -C HEAD"
+alias gfixs="ga && git commit -S -a --amend -C HEAD" # signed
 alias gfo='git fetch origin'
 alias gfm='git fetch origin master'
 alias gh="source ~/.githelpers && show_git_head"
@@ -139,11 +153,11 @@ alias grbm='git fetch origin master && git rebase master'
 alias grbmi='git fetch origin master && git rebase master -i'
 alias grbo='git fetch origin master && git rebase origin/master'
 alias gre='git remote'
+alias grea='git remote add origin'
 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='echo "use gsh instead!"'
 alias gsh='git show'
 alias gst='git status'
 alias gs='git stash'
@@ -160,32 +174,29 @@ alias gxx='git reset --hard HEAD~1 && git pull --ff-only'
 
 # Notes
 alias art='cd ~/Dropbox/notes/art'
-alias bucket='cd ~/Dropbox/notes/buckets'
-alias daily='cd ~/Dropbox/notes/daily/daily-log'
-alias log='cd ~/Dropbox/notes/daily/daily-log'
 alias notes='cd ~/Dropbox/notes'
-alias pn='vim ~/Dropbox/notes/project-notes'
+alias bucket='cd ~/Dropbox/notes/buckets'
+alias pn='vim ~/Dropbox/notes/stack.txt'
 alias sharp='vim ~/Dropbox/notes/sharpening-notes'
-alias todo='vim ~/Dropbox/notes/daily/todo'
-alias writing='cd ~/Dropbox/notes/writing'
+alias writing='cd ~/brain/writing'
+alias what='cd ~/brain/writing/2014/what-happened'
 
 # Projects
 alias projects='cd ~/code/projects'
 alias web='cd ~/code/projects/websites/michael.is'
 alias weba='cd ~/code/projects/websites/michael.is/angular'
 alias dot='cd ~/code/projects/dotfiles'
-alias work='cd ~/code/work'
-alias learn='cd ~/code/learning-area'
-alias pcg='cd ~/code/work/pcg'
+alias work='cd ~/work'
+alias brain='cd ~/brain'
+alias school='cd ~/brain/school'
+alias pcg='cd ~/work/pcg'
 
 # Work
-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'
-
-# DB
-alias start-postgres='pg_ctl -D /usr/local/var/postgres -l logfile start'
-
+alias pcgn='vim ~/work/pcg/files/personal-notes.txt'
+alias pcgf='cd ~/work/pcg/files'
+alias bastion='ssh 54.86.79.26 -l pcg-user -i ~/.ssh/pcg-ec2-pcg-user'
+alias sigma='cd ~/pcg/pcg-ansible/ && ssh -vF files/ssh/config pcg-user@sigma'
+alias qonos='cd ~/pcg/pcg-ansible/ && ssh -vF files/ssh/config pcg-user@qonos'
+alias samza1='cd ~/pcg/pcg-ansible/ && ssh -vF files/ssh/config pcg-user@samza1'
+alias samza2='cd ~/pcg/pcg-ansible/ && ssh -vF files/ssh/config pcg-user@samza2'
+alias samza3='cd ~/pcg/pcg-ansible/ && ssh -vF files/ssh/config pcg-user@samza3'