diff --git a/aliases b/aliases
index 3c000c8..30657e3 100644
--- a/aliases
+++ b/aliases
@@ -97,3 +97,6 @@ alias db-pull-production='heroku db:pull --remote production --confirm `basename
 # Yammer
 alias yam='cd ~/dev/yammer/sched.do/'
 alias yamux='teamocil --here yammer'
+
+# Fanhattan
+alias fan='cd ~/dev/fanhattan/'
diff --git a/gitconfig b/gitconfig
index b4e1820..9f0813d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,15 +5,15 @@
   pretty = %Cblue%h%Creset %Cgreen[%ar]%Creset (%an) %s
 
 [user]
-	name = Adarsh Pandit
-	email = adarsh@thoughtbot.com
+  name = Adarsh Pandit
+  email = adarsh@thoughtbot.com
 
 [color]
-  ui = true
+ ui = auto
 
 [alias]
   a = add
-  aa= !git add -u && git add . && git status
+  aa = add --all
   c = commit -m
   cob = checkout -b
   down = !git checkout master && git merge @{-1} --ff-only
@@ -22,6 +22,11 @@
 
 [credential]
 	helper = osxkeychain
+
 [core]
 	ignorecase = true
 	excludesfile = /Users/adarsh/.gitignore_global
+  whitespace = trailing-space,space-before-tab
+
+[apply]
+	whitespace = warn
diff --git a/gitignore_global b/gitignore_global
index ea1834a..f5ee53b 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -1,3 +1,6 @@
 # For zeus
 zeus.json
 custom_plan.rb
+
+# for chruby
+.ruby-version
diff --git a/vim/bundle/vim-colors-github b/vim/bundle/vim-colors-github
new file mode 160000
index 0000000..e5bc567
--- /dev/null
+++ b/vim/bundle/vim-colors-github
@@ -0,0 +1 @@
+Subproject commit e5bc5678c8509cdc99541dcc585e65bcc2f79f19
diff --git a/vimrc b/vimrc
index 6dc760f..10162cc 100644
--- a/vimrc
+++ b/vimrc
@@ -7,12 +7,13 @@ call vundle#rc()
 
 " let Vundle manage Vundle (required!)
 Bundle 'gmarik/vundle'
-Bundle 'tpope/vim-rails.git'
-Bundle 'tpope/vim-fugitive'
-Bundle 'jgdavey/vim-turbux'
 Bundle 'jgdavey/tslime.vim'
-Bundle 'mileszs/ack.vim'
+Bundle 'jgdavey/vim-turbux'
 Bundle 'kien/ctrlp.vim'
+Bundle 'mileszs/ack.vim'
+Bundle 'tpope/vim-fugitive'
+Bundle 'tpope/vim-markdown'
+Bundle 'tpope/vim-rails.git'
 Bundle 'vim-ruby/vim-ruby'
 
 " End Vundle Setup
diff --git a/zshrc b/zshrc
index 5692d84..5be1571 100644
--- a/zshrc
+++ b/zshrc
@@ -53,9 +53,19 @@ export EYRC=./.eyrc
 setopt auto_pushd
 export dirstacksize=5
 
+# Source the chruby shell script
+source /usr/local/opt/chruby/share/chruby/chruby.sh
+# source /usr/local/opt/chruby/share/chruby/auto.sh
+
 # recommended by brew doctor
 export PATH='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/opt/local/bin:/opt/local/sbin:/usr/texbin'
 
 # Enable zmv, alias to 'mmv' to allow matching like `mmv *.mp3 *.old.mp3`
 autoload -U zmv
 alias mmv='noglob zmv -W'
+
+#RVM
+# PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+
+#Fanhattan
+export RACK_ENV=development