From b11b38620b7a3f8d92552e9a2545eb3776197ca4 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Mon, 1 Apr 2013 02:16:52 +0000
Subject: [PATCH] Fixing a bunch of stuff up. Install is cleaner now.

---
 {completions => .completions}/_git     |  0
 {completions => .completions}/_testify |  0
 .zshrc                                 | 29 ++++++++++++++++++++++++++
 bin/bash                               |  1 -
 bootstrap.sh                           |  7 ++++++-
 oh-my-zsh                              |  2 +-
 6 files changed, 36 insertions(+), 3 deletions(-)
 rename {completions => .completions}/_git (100%)
 rename {completions => .completions}/_testify (100%)
 create mode 100644 .zshrc
 delete mode 120000 bin/bash

diff --git a/completions/_git b/.completions/_git
similarity index 100%
rename from completions/_git
rename to .completions/_git
diff --git a/completions/_testify b/.completions/_testify
similarity index 100%
rename from completions/_testify
rename to .completions/_testify
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 00000000..e4d1b5fc
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,29 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Customize to your needs...
+for file in ~/.{path,exports,prompt,aliases,functions,extra}; do
+    [ -r "$file" ] && source "$file"
+done
+
+ZSH_THEME="fino"
+
+# Set to this to use case-sensitive completion
+CASE_SENSITIVE="true"
+
+# Comment this out to disable bi-weekly auto-update checks
+DISABLE_AUTO_UPDATE="true"
+
+plugins=(git github heroku)
+
+source $ZSH/oh-my-zsh.sh
+
+unset file
+
+# COMPLETION SETTINGS
+# add custom completion scripts
+fpath=(~/.completions $fpath) 
+ 
+# compsys initialization
+autoload -U compinit
+compinit
diff --git a/bin/bash b/bin/bash
deleted file mode 120000
index c46b67e6..00000000
--- a/bin/bash
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/Cellar/bash/4.2.42/bin/bash
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index 8ddda125..299d4f3e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
 cd "$(dirname "${BASH_SOURCE}")"
 function doIt() {
-    rsync --exclude "Monaco-Powerline.otf" --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" --exclude "setup.sh" -av . ~
+    rsync --exclude "setup.sh" --exclude "Monaco-Powerline.otf" --exclude "web_start.sh" \
+        --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" \
+        --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" \
+        --exclude "requirements.txt" --exclude "more_python.txt" \
+        -av . ~
 }
+
 if [ "$1" == "--force" -o "$1" == "-f" ]; then
     doIt
 else
diff --git a/oh-my-zsh b/oh-my-zsh
index 13c54cef..ac9588ba 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 13c54cef7a68b7c66c813a1775ded352da0059e4
+Subproject commit ac9588ba3c8b361b11ce969a676a737298a2295f