diff --git a/vim/bundle/vim-coffee-script b/vim/bundle/vim-coffee-script
new file mode 160000
index 0000000..fd09aea
--- /dev/null
+++ b/vim/bundle/vim-coffee-script
@@ -0,0 +1 @@
+Subproject commit fd09aea1c0944eddd9dd6e5a22db4d52b7894490
diff --git a/vimrc b/vimrc
index be73817..394fb62 100644
--- a/vimrc
+++ b/vimrc
@@ -10,7 +10,7 @@ call pathogen#helptags()
 set runtimepath^=~/.vim/bundle/ctrlp.vim
 let g:ctrlp_map = '<leader>ff'
 let g:ctrlp_cmd = 'CtrlP'
-let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
+let g:ctrlp_custom_ignore = 'public\|node_modules\|DS_Store\|lightscampusaction\|git|*.pyc'
 map <leader>fr :call ShowRoutes()<cr>
 map <leader>fv :CtrlP app/views<cr>
 map <leader>fc :CtrlP app/controllers<cr>
diff --git a/zlogin b/zlogin
index a161a04..dee8256 100644
--- a/zlogin
+++ b/zlogin
@@ -3,6 +3,3 @@ if [[ -f ~/.current_path~ ]]; then
   cd `cat ~/.current_path~`
   rm ~/.current_path~
 fi
-
-# Display todos
-quirk
diff --git a/zsh/aliases b/zsh/aliases
index e75d686..9a6d564 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -16,7 +16,6 @@ alias cd..='cd ..'
 alias cd...='cd ../..'
 alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
-alias cd/='cd /'
 alias ls='ls -G'
 
 alias aliases='vim ~/.dotfiles/zsh/aliases'
@@ -36,7 +35,6 @@ alias dr='cd ~/Dropbox'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/zsh/functions'
 alias f='fg'
-alias for='foreman start -p 9292'
 alias history='fc -l 1'
 alias h='heroku'
 alias irb='irb --readline -r irb/completion'
@@ -44,6 +42,7 @@ alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
 alias rb='rbenv'
+alias rg='rails generate'
 alias rmr='rm -rf'
 alias rc='rails console'
 alias rs='rails server'
@@ -64,8 +63,9 @@ alias zsh='vim ~/.zshrc'
 # Git
 alias ammend='amend'
 alias amend='git commit --amend'
-alias gaa='git add -A :/'
-alias ga='git add -A'
+alias g='gst'
+alias ga='git add -A :/'
+alias gaa='git add -A'
 alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed
 alias gau='git add --update'
 alias gb='git branch'
@@ -85,12 +85,16 @@ alias gdw='git diff --color-words'
 alias gf='git fetch'
 alias gh="source ~/.githelpers && show_git_head"
 alias gl='gll -25'
+alias gli='git show --pretty="format:" --name-only'
 alias gll="source ~/.githelpers && pretty_git_log"
 alias gla='gll --all'
+alias glog='git log'
 alias gm='git merge'
 alias gmff='git merge --ff-only'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
+alias gpd='git push && git push heroku master'
+alias gph='git push heroku master'
 alias gpf='git push -f'
 alias gpu='git push -u'
 alias gpff='git pull --ff-only'
@@ -98,13 +102,17 @@ alias gpl='git pull'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
 alias gr='git reset'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbo='git fetch origin && git rebase origin/master'
 alias grbm='git rebase master'
-alias grc='git rebase --continue'
 alias gre='git remote'
 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 gst='git status'
 alias gs='git stash'
 alias gss='git stash save'
@@ -114,35 +122,34 @@ alias gsp='git stash pop'
 alias gx='git reset --hard'
 
 # Notes
-alias todo='vim ~/Dropbox/notes/daily/todo'
-alias sharp='vim ~/Dropbox/notes/sharpening-notes'
+alias art='cd ~/Dropbox/notes/art'
+alias bucket='cd ~/Dropbox/notes/buckets'
 alias completion='cd ~/Dropbox/notes/daily/daily-log/completion-list'
-alias log='cd ~/Dropbox/notes/daily/daily-log'
-alias powerup='vim ~/Dropbox/notes/code/powerup'
-alias notes='cd ~/Dropbox/notes'
 alias daily='cd ~/Dropbox/notes/daily'
 alias guide='vim ~/Dropbox/notes/daily/DAILY_GUIDE'
+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 powerup='vim ~/Dropbox/notes/code/powerup'
+alias sharp='vim ~/Dropbox/notes/sharpening-notes'
+alias todo='vim ~/Dropbox/notes/daily/todo'
 
 # Projects
 alias projects='cd ~/code/projects'
-alias websites='cd ~/code/projects/websites'
+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 current='cd ~/code/projects/robocoin'
+alias robo='cd ~/code/projects/robocoin'
+alias roboa='cd ~/code/projects/robocoin/angular'
+alias pcg='cd ~/code/work/pcg'
+alias sc='cd ~/code/work/redwood/scene-app/angular'
+alias cur='cd ~/code/projects/things'
 
 # Open Source
 alias ssh-discourse='ssh -F ~/code/projects/discourse/.project/vagrant.ssh.conf default'
 
-# Heroku staging
-alias staging-console='heroku run console --app campusperks-staging'
-alias staging-tail='heroku logs --tail --app campusperks-staging'
-
-# Heroku production
-alias production-console='heroku run console --app campusperks'
-alias production-tail='heroku logs --tail --app campusperks'
-
 # DB
 alias start-postgres='pg_ctl -D /usr/local/var/postgres -l logfile start'
+
diff --git a/zshrc b/zshrc
index 0c0b343..5b26366 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=tmp --exclude-dir=public --exclude-dir=log" # --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=vendor --exclude-dir=tmp --exclude-dir=public --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components" # --exclude-dir=vendor/assets --exclude-dir=fonts --exclude-dir=images --exclude-dir=coverage --exclude-dir=rdoc"
 
 # Save a ton of history
 export HISTSIZE=20000
@@ -69,3 +69,10 @@ export RUBY_HEAP_SLOTS_INCREMENT=1000000
 export RUBY_HEAP_SLOTS_GROWTH_FACTOR=1
 export RUBY_GC_MALLOC_LIMIT=1000000000
 export RUBY_HEAP_FREE_MIN=500000
+
+# Setup Ansible
+export PATH=/Users/pulsar/Code/open-source/ansible/bin:${PATH}
+export PYTHONPATH=/Users/pulsar/Code/open-source/ansible/lib:${PYTHONPATH}
+export ANSIBLE_LIBRARY=/Users/pulsar/Code/open-source/ansible/library
+export MANPATH=/Users/pulsar/Code/open-source/ansible/docs/man:${MANPATH}
+export ANSIBLE_HOSTS=~/.ansible_hosts