diff --git a/.gitignore b/.gitignore
index 5db11ce5c..eba32e0f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,8 @@ custom/example.zsh
 *.swp
 !custom/example.zshcache
 cache/
+.DS_Store
+*/.DS_Store
+*/*/.DS_Store
+*/**/.DS_Store
+
diff --git a/README.textile b/README.textile
index 86dd5da22..a3f53f77c 100644
--- a/README.textile
+++ b/README.textile
@@ -4,43 +4,27 @@ oh-my-zsh is an open source, community-driven framework for managing your ZSH co
 
 bq. "OH MY ZSHELL!"
 
+h2. Big thanks to @robbyrussell for building oh-my-zsh
+
 h2. Setup
 
 @oh-my-zsh@ should work with any recent release of "zsh":http://www.zsh.org/, the minimum recommended version is 4.3.9.
 
-h3. The automatic installer... (do you trust me?)
-
-You can install this via the command line with either `curl` or `wget`.
-
-h4. via `curl`
-
-@curl -L https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh | sh@
-
-h4. via `wget`
-
-@wget --no-check-certificate https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | sh@
-
-h3. The manual way
-
+h3. Installation
 
 1. Clone the repository
 
-  @git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh@
+  @git clone git://github.com/sasasasumna/oh-my-zsh.git ~/.oh-my-zsh@
 
 2. *OPTIONAL* Backup your existing ~/.zshrc file
 
   @cp ~/.zshrc ~/.zshrc.orig@
 
-3. Create a new zsh config by copying the zsh template we've provided.
+3. Run the setup script
 
-  @cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc@
+  @~/.oh-my-zsh/setup.sh@
 
-
-4. Set zsh as your default shell:
-
-  @chsh -s /bin/zsh@
-
-5. Start / restart zsh (open a new terminal is easy enough...)
+4. Start / restart zsh (open a new terminal is easy enough...)
 
 h3. Problems?
 
diff --git a/homebrew_packages.txt b/homebrew_packages.txt
new file mode 100644
index 000000000..a966d516a
--- /dev/null
+++ b/homebrew_packages.txt
@@ -0,0 +1,43 @@
+android-sdk
+apple-gcc42
+autoconf
+beanstalk
+boost
+chromedriver
+cmake
+curl
+elasticsearch
+freetype
+gdbm
+gettext
+git
+graphviz
+heroku-toolbelt
+hub
+libevent
+libffi
+libpng
+libyaml
+lzlib
+maven
+memcached
+mysql
+neo4j
+node
+openssl
+ossp-uuid
+pcre
+phantomjs
+pkg-config
+postgresql
+rabbitmq
+rbenv
+readline
+redis
+ruby-build
+v8
+vim
+wget
+xz
+zlib
+zsh
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 000000000..f49b9eeb8
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+brew update
+brew upgrade
+brew install `cat homebrew_packages.txt`
+
+[ ! -f ~/.zshrc ]          && cp ~/.oh-my-zsh/templates/zshrc.zsh-template          ~/.zshrc
+[ ! -f ~/.variables ]      && cp ~/.oh-my-zsh/templates/variables.zsh-template      ~/.variables
+[ ! -f ~/.aliases ]        && cp ~/.oh-my-zsh/templates/aliases.zsh-template        ~/.aliases
+[ ! -f ~/.secrets ]        && cp ~/.oh-my-zsh/templates/secrets.zsh-template        ~/.secrets
+[ ! -f ~/.customizations ] && cp ~/.oh-my-zsh/templates/customizations.zsh-template ~/.customizations
+[ ! -f ~/.gemrc]           && cp ~/.oh-my-zsh/templates/gemrc.zsh-template          ~/.gemrc
+
+echo "/usr/local/bin/zsh" >> /etc/shells  # TODO grep to ensure that this line isn't there before appending it
+chsh -s /usr/local/bin/zsh `whoami`
diff --git a/templates/aliases.zsh-template b/templates/aliases.zsh-template
new file mode 100644
index 000000000..204101b4c
--- /dev/null
+++ b/templates/aliases.zsh-template
@@ -0,0 +1,4 @@
+# Put your aliases here
+
+alias git=hub
+
diff --git a/templates/customizations.zsh-template b/templates/customizations.zsh-template
new file mode 100644
index 000000000..6cb4d06fd
--- /dev/null
+++ b/templates/customizations.zsh-template
@@ -0,0 +1,6 @@
+unalias run-help
+autoload run-help
+export HELPDIR=/usr/local/share/zsh/helpfiles
+
+if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+
diff --git a/templates/gemrc.zsh-template b/templates/gemrc.zsh-template
new file mode 100644
index 000000000..9654f23cb
--- /dev/null
+++ b/templates/gemrc.zsh-template
@@ -0,0 +1,3 @@
+install: --no-rdoc --no-ri
+update:  --no-rdoc --no-ri
+
diff --git a/templates/secrets.zsh-template b/templates/secrets.zsh-template
new file mode 100644
index 000000000..678dda7d6
--- /dev/null
+++ b/templates/secrets.zsh-template
@@ -0,0 +1,2 @@
+# Put all secret keys here
+
diff --git a/templates/variables.zsh-template b/templates/variables.zsh-template
new file mode 100644
index 000000000..d564ab980
--- /dev/null
+++ b/templates/variables.zsh-template
@@ -0,0 +1,6 @@
+# Put variables here
+export RBENV_ROOT=/usr/local/var/rbenv
+export PATH=/usr/local/share/npm/bin:/usr/local/bin:/usr/local/sbin:$PATH
+export JAVA_HOME=`/usr/libexec/java_home`
+export ANDROID_HOME=/usr/local/opt/android-sdk
+
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 1dfb6998c..981ecd50c 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -1,12 +1,9 @@
-# Path to your oh-my-zsh configuration.
 ZSH=$HOME/.oh-my-zsh
-
-# Set name of the theme to load.
-# 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"
 
+DISABLE_AUTO_UPDATE="true"
+DISABLE_CORRECTION="true"
+
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
@@ -37,11 +34,11 @@ ZSH_THEME="robbyrussell"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
-# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(git)
+plugins=(brew bundler battery colored-man colorize copydir copyfile cp dircycle encode64 extract gem git git-extras git-remote-branch history-substring-search history jira jruby npm node osx postgres rails rake rbenv ruby sublime urltools)
 
 source $ZSH/oh-my-zsh.sh
+source ~/.aliases
+source ~/.variables
+source ~/.secrets
+source ~/.customizations
 
-# Customize to your needs...