diff --git a/other/.bash_aliases b/other/.aliases
similarity index 100%
rename from other/.bash_aliases
rename to other/.aliases
diff --git a/other/.zshrc_master b/other/.zshrc_master
new file mode 100644
index 0000000..ab0366b
--- /dev/null
+++ b/other/.zshrc_master
@@ -0,0 +1,63 @@
+#!/bin/zsh
+# This file should be sourced by the local .bashrc and should hold all the
+# functionality of what would normally go in .bashrc
+
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# Get the directory of this file (other bash files we source are in the
+# same directory)
+DIR="$( cd "$( dirname "${(%):-%N}" )" && pwd )"
+
+# Load antigen
+source "$HOME/.antigen/antigen.zsh"
+antigen use oh-my-zsh
+antigen bundle git
+antigen bundle command-not-found
+antigen bundle zsh-users/zsh-completions src
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen theme robbyrussell
+antigen apply
+
+
+# If not running interactively, don't do anything
+[ -z "$PS1" ] && return
+
+# don't put duplicate lines in the history. See bash(1) for more options
+# ... or force ignoredups and ignorespace
+HISTCONTROL=ignoredups:ignorespace
+
+# append to the history file, don't overwrite it
+setopt inc_append_history
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=10000
+HISTFILESIZE=99999999
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+#setopt -s checkwinsize
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f $DIR"/.aliases" ]; then
+    . $DIR"/.aliases"
+fi
+
+export EDITOR="emacs -nw"
+export PATH=$PATH:~/bin
+
+#Git branch in prompt.
+#parse_git_branch() {
+#    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
+#}
+#export PS1="\u@\h \W\[\033[32m\]\$(parse_git_branch)\[\033[00m\] $ "
+autoload -U colors && colors
+export TERM=xterm-256color