diff --git a/vim/bundle/VimClojure b/vim/bundle/VimClojure
new file mode 160000
index 0000000..2a17c24
--- /dev/null
+++ b/vim/bundle/VimClojure
@@ -0,0 +1 @@
+Subproject commit 2a17c249571395a7f45523d38cac6a9326ecf8f1
diff --git a/vim/bundle/vim-elixir b/vim/bundle/vim-elixir
index 14d21bb..b27b35e 160000
--- a/vim/bundle/vim-elixir
+++ b/vim/bundle/vim-elixir
@@ -1 +1 @@
-Subproject commit 14d21bb91f68d5e26f0c56a65bfe4bae31710ba1
+Subproject commit b27b35e401b5fa3a13f23c52a902533436c50368
diff --git a/vimrc b/vimrc
index 4d96faf..1c39172 100644
--- a/vimrc
+++ b/vimrc
@@ -107,6 +107,9 @@ set undoreload=10000
 au BufNewFile,BufRead *.txt setlocal wrap
 au BufNewFile,BufRead *.txt setlocal lbr
 
+" Clojurescript syntax highlighting
+au BufNewFile,BufRead *.cljs set filetype=clojure
+
 " Fix vim's background colour erase - http://snk.tuxfamily.org/log/vim-256color-bce.html
 if &term =~ '256color'
   " Disable Background Color Erase (BCE) so that color schemes
@@ -166,8 +169,8 @@ imap <c-e> end
 imap <c-l> <space>=><space>
 
 " Mapping ESC in insert mode and command mode to double i
-imap ii <C-[>
-cmap ii <C-[>
+"imap ii <C-[>
+"cmap ii <C-[>
 
 " suspend process
 nmap <leader>z <c-z>
diff --git a/zsh/aliases b/zsh/aliases
index 136d62d..e037f06 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -6,6 +6,7 @@ if [[ $platform == 'Linux' ]]; then
 elif [[ $platform == 'Darwin' ]]; then
   alias l='ls -laG'
   alias ll='ls -lG'
+  alias lll='ls -lrath'
 fi
 
 alias c='cd'
@@ -16,7 +17,7 @@ alias cd..='cd ..'
 alias cd...='cd ../..'
 alias cd....='cd ../../..'
 alias cd.....='cd ../../../..'
-alias ls='ls -G'
+alias ls='ls -lG'
 
 alias aliases='vim ~/.dotfiles/zsh/aliases'
 alias al='aliases'
@@ -48,7 +49,9 @@ alias history='fc -l 1'
 alias histroy='history'
 alias h='heroku'
 alias ho='heroku open'
+alias hc='heroku config'
 alias hca='heroku config:add'
+alias hcu='heroku config:unset'
 alias irb='irb --readline -r irb/completion'
 alias li='lineman'
 alias lir='lineman run'
@@ -56,6 +59,14 @@ alias lib='lineman build'
 alias lig='lineman grunt'
 alias lis='lineman spec'
 alias lic='lineman spec-ci'
+alias lmi='lein modules install'
+alias mc='mvn compile'
+alias mct='mvn test'
+alias mi='mvn install'
+alias mci='mvn clean install'
+alias mp='mvn package'
+alias mcp='mvn clean package'
+alias opensource='cd ~/code/open-source'
 alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
@@ -72,10 +83,14 @@ alias rs='rails server'
 alias reload='source ~/.zshrc'
 alias s='cd ~/.ssh'
 alias sc='vim ~/.ssh/config'
+alias t='tree'
 alias tail-logs='heroku logs -t'
 alias u='cd ..'
 alias v='vim'
 alias vi='vim'
+alias vh='vagrant halt'
+alias vs='vagrant ssh'
+alias vu='vagrant up'
 alias vimrc='vim ~/.vimrc'
 alias q='quirk'
 alias qe='quirk -e'
@@ -96,6 +111,7 @@ alias gau='git add --update'
 alias gb='git branch'
 alias gbd='git branch -D'
 alias gbl='git branch --all'
+alias gbm='git branch -m'
 alias gc='git commit'
 alias gcs='git commit -S'
 alias gcl='git clone'
@@ -134,10 +150,10 @@ 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 gph='echo "pushing $(git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3) to Heroku master" && git push heroku HEAD:master'
 alias gphf='git push heroku master --force'
 alias gpf='git push -f'
-alias gpu='git push -u'
+alias gpu='git push -u origin master'
 alias gpff='git pull --ff-only'
 alias gpl='git pull'
 alias gpo='git push origin'
@@ -153,7 +169,8 @@ 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 grea='git remote add'
+alias greao='git remote add origin'
 alias gref='git reflog'
 alias grev='git remote -v'
 alias grm='git rm'
@@ -163,6 +180,7 @@ alias gst='git status'
 alias gs='git stash'
 alias gss='git stash save'
 alias gsd='git stash drop'
+alias gsdl='git stash drop stash@{0}'
 alias gsl='git stash list'
 alias gsp='git stash pop'
 alias gt='git tag'
@@ -190,13 +208,15 @@ alias work='cd ~/work'
 alias brain='cd ~/brain'
 alias school='cd ~/brain/school'
 alias pcg='cd ~/work/pcg'
+alias dive='cd ~/work/pcg/dive-network/dive'
 
 # Work
-alias pcgn='vim ~/work/pcg/files/personal-notes.txt'
+alias pcgn='vim ~/work/pcg/files/notes/personal-notes.txt'
+alias pcgr='vim ~/work/pcg/files/notes/refactoring-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'
+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'
diff --git a/zsh/functions b/zsh/functions
index 1d593f2..d067c79 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -69,10 +69,6 @@ function hist() {
    cat ~/.history|cut -d ';' -f 2- 2>/dev/null| awk '{a[$1]++ } END{for(i in a){print a[i] " " i}}'|sort -rn|head
 }
 
-function run_quirk() {
-  quirk
-}
-
 function bump_gem_version {
   if [[ $# -eq 0 ]]; then
     echo "usage: $0 <version>"
diff --git a/zshrc b/zshrc
index 1b2469c..07201db 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=tmp --exclude-dir=public --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage --exclude-dir=.bundle --exclude=*.csv --exclude=*.pdf --exclude-dir=vendor --exclude-dir=rdoc --exclude-dir=personal" # --exclude-dir=images --exclude-dir=coverage
+export GREP_OPTIONS="-nRi --color --exclude-dir=.git  --exclude-dir=tmp --exclude-dir=log --exclude-dir=node_modules --exclude-dir=bower_components --exclude-dir=coverage --exclude-dir=.bundle --exclude=*.csv --exclude=*.pdf --exclude-dir=vendor --exclude-dir=rdoc --exclude-dir=personal" # --exclude-dir=images --exclude-dir=coverage
 
 # Save a ton of history
 export HISTSIZE=20000