diff --git a/lib/aliases.zsh b/lib/aliases.zsh
index aae865046..2d8d03d2b 100644
--- a/lib/aliases.zsh
+++ b/lib/aliases.zsh
@@ -27,9 +27,89 @@ else
 fi
 # List direcory contents
 alias lsa='ls -lah'
+alias l='ls -la'
+#alias ll='ls -l'
+alias sl=ls # often screw this up
 alias l='ls -lah'
 alias ll='ls -lh'
 alias la='ls -lAh'
 
 alias afind='ack-grep -il'
 
+# DD: mine, or added from https://github.com/thoughtbot/dotfiles
+
+# Folder aliases
+alias ls='ls -F'
+alias la='la -A'
+alias ll='ls -lA'
+alias ..='cd ..'
+alias ...='../..'
+alias path='echo -e ${PATH//:/\\\n}'
+
+# Ruby aliases
+alias rss='ruby script/server'
+alias rssd='ruby script/server -u'
+alias rsc='ruby script/console'
+
+# Gem/Rails aliases
+alias geml='gem list --local | more'
+alias geme='cd `rvm gemdir`/gems; ls'
+alias cap='bundle exec cap'
+alias rake='bundle exec rake'
+#alias migrate="rake db:migrate db:test:prepare"
+#alias remigrate="rake db:migrate && rake db:migrate:redo && rake db:schema:dump db:test:prepare"
+#alias remongrate="rake mongoid:migrate && rake mongoid:migrate:redo"
+
+# POW aliases
+alias p='powder'
+
+# Git aliases
+alias g="git"
+alias glog='git log --color'
+alias gd='git diff --color'
+alias gs='git status'
+alias gcom='git commit'
+alias gpu='git pull'
+alias gps='git push'
+alias gcm='git checkout master'
+alias gcp='git checkout production'
+alias gch='git checkout'
+alias gmm='git merge master'
+#alias gci="git pull --rebase && rake && git push"
+alias tlf="tail -f"
+
+alias ln='ln -v'
+alias mkdir='mkdir -p'
+
+alias -g G='| grep'
+alias -g M='| less'
+alias -g L='| wc -l'
+alias -g ONE="| awk '{ print \$1}'"
+
+# git
+alias gci="git pull --rebase && rake && git push"
+
+# Bundler
+alias b="bundle"
+alias be="bundle exec"
+alias bake="bundle exec rake"
+
+# Tests and Specs
+alias t="ruby -I test"
+alias s="bundle exec rspec"
+alias cuc="bundle exec cucumber"
+
+# Rubygems
+alias gi="gem install"
+alias giv="gem install -v"
+
+# Network
+alias whats-my-ip="curl -s checkip.dyndns.org | grep -Eo '[0-9\.]+'"
+
+# Annoyances
+alias heroku='nocorrect heroku'
+alias h='heroku'
+alias jitsu='nocorrect jitsu'
+alias guard='bundle exec guard'
+
+
diff --git a/lib/editor.zsh b/lib/editor.zsh
new file mode 100644
index 000000000..2e1828810
--- /dev/null
+++ b/lib/editor.zsh
@@ -0,0 +1,4 @@
+#
+# Editor options
+#
+export EDITOR=subl
\ No newline at end of file
diff --git a/lib/path.zsh b/lib/path.zsh
new file mode 100644
index 000000000..1f3991dbd
--- /dev/null
+++ b/lib/path.zsh
@@ -0,0 +1,2 @@
+# DD: added, so that Titanium Appcelerator will work: http://developer.appcelerator.com/question/145794/launching-simulator-process-failed
+export PATH=$PATH:/usr/local/share/npm/bin
\ No newline at end of file
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 763288dfd..591f91426 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,7 +5,7 @@ export ZSH=$HOME/.oh-my-zsh
 # Look in ~/.oh-my-zsh/themes/
 # Optionally, if you set this to "random", it'll load a random theme each
 # time that oh-my-zsh is loaded.
-ZSH_THEME="robbyrussell"
+ZSH_THEME="eastwood"
 
 # Uncomment the following line to use case-sensitive completion.
 # CASE_SENSITIVE="true"
@@ -45,7 +45,7 @@ ZSH_THEME="robbyrussell"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git)
+plugins=(git ssh-agent sublime)
 
 # User configuration