diff --git a/.gitconfig b/.gitconfig
index 0f130c1a..0b7c8291 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -74,7 +74,4 @@
 	pushInsteadOf = "gist:"
 	pushInsteadOf = "git://gist.github.com/"
 [url "git://gist.github.com/"]
-	insteadOf = "gist:"
-
-[push]
-	default = simple
\ No newline at end of file
+	insteadOf = "gist:"
\ No newline at end of file
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 00000000..adaac904
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,32 @@
+# Path to your oh-my-zsh configuration.
+ZSH=$HOME/.oh-my-zsh
+
+# Customize to your needs...
+for file in ~/.{path,bash_prompt,exports,shared_exports,aliases,functions,extra}; do
+	[ -r "$file" ] && source "$file"
+done
+
+# 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="fino"
+
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+# 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"
+
+# Uncomment to change how many often would you like to wait before auto-updates occur? (in days)
+# export UPDATE_ZSH_DAYS=13
+
+plugins=(git github heroku)
+
+source $ZSH/oh-my-zsh.sh
+
+unset file
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index f29ba871..3c719953 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -2,16 +2,16 @@
 cd "$(dirname "${BASH_SOURCE}")"
 git pull
 function doIt() {
-	rsync --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" -av . ~
+    rsync --exclude "oh-my-zsh" --exclude "tmux-powerline" --exclude ".git/" --exclude ".DS_Store" --exclude "bootstrap.sh" --exclude "README.md" --exclude "setup.sh" -av . ~
 }
 if [ "$1" == "--force" -o "$1" == "-f" ]; then
-	doIt
+    doIt
 else
-	read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1
-	echo
-	if [[ $REPLY =~ ^[Yy]$ ]]; then
-		doIt
-	fi
+    read -p "This may overwrite existing files in your home directory. Are you sure? (y/n) " -n 1
+    echo
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+	doIt
+    fi
 fi
 unset doIt
 source ~/.bash_profile
diff --git a/oh-my-zsh b/oh-my-zsh
index e75662a0..77c07793 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit e75662a030aa9ba8378b5557719df38e2e570d44
+Subproject commit 77c07793bd941101ad375e1fe9f16e075850465f
diff --git a/setup.sh b/setup.sh
index 9ac4c340..b0c8773c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
+# Go to the source directory of this script.
 cd "$(dirname "${BASH_SOURCE}")"
-
+sudo -v
 source bootstrap.sh
 
 case `uname` in