diff --git a/bin/server-reload b/bin/server-reload
new file mode 100755
index 0000000..6b16d37
--- /dev/null
+++ b/bin/server-reload
@@ -0,0 +1,4 @@
+#!/bin/sh
+ps aux | grep nginx | awk '{print }' | xargs sudo kill -9
+sudo nginx
+script/unicorn_dev
diff --git a/git/aliases.zsh b/git/aliases.zsh
index ff0589a..32857b6 100644
--- a/git/aliases.zsh
+++ b/git/aliases.zsh
@@ -1,33 +1,21 @@
 # Use `hub` as our git wrapper:
 #   http://defunkt.github.com/hub/
-#
-# I use JRuby substantially, and we want to make sure hub is run using MRI
-# regardless of which Ruby you're using or else the `git status` in your prompt
-# will take seven thousand seconds to run `ls`.
-#
-# I'm hardcoding it to an installed rvm (using rvm's `rvm 1.8.7,ruby /hub/path`
-# syntax is way too slow). It should work fine for those without rvm, though.
-if [[ -s $HOME/.rvm/scripts/rvm ]] 
-then
-  # alias git='$HOME/.rvm/rubies/ruby-1.8.7-p302/bin/ruby `which hub`'
-  alias git='$HOME/.rvm/rubies/ruby-1.8.7-p330/bin/ruby `which hub`'
-fi
-
-# The rest of my fun git aliases
-# alias ga='git add .'
+git(){hub "$@"}
 ga() {
  git add .
  git add -u
 }
-alias gl='git pull --rebase --prune'
-alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
-alias gp='git push origin HEAD'
+alias g='git'
+alias gp='git pull --rebase --prune'
+alias gpush='git push origin HEAD'
+# alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative"
+# alias gp='git push origin HEAD'
 alias gd='git diff'
 alias gc='git commit'
 alias gitc='git commit -m'
-alias gca='git commit -a'
+# alias gca='git commit -a'
 alias gco='git checkout'
 alias gb='git branch'
 alias gss='git status -sb' # upgrade your git if -sb breaks for you. it's fun.
-alias gs='git status' # upgrade your git if -sb breaks for you. it's fun.
-alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
+alias gs='git status'
+# alias grm="git status | grep deleted | awk '{print \$3}' | xargs git rm"
diff --git a/git/gitconfig.sample b/git/gitconfig.sample
index c8128fd..f2c5db4 100644
--- a/git/gitconfig.sample
+++ b/git/gitconfig.sample
@@ -7,24 +7,17 @@
 # can symlink ~/.gitconfig to this file and go rock out with your git out!
 
 [user]
-        name = Zach Holman
-        email = your@example.com
-[alias]
-        co = checkout
-        promote = !$ZSH/bin/git-promote
-        wtf     = !$ZSH/bin/git-wtf
-        rank-contributers = !$ZSH/bin/git-rank-contributers
-        count   = !git shortlog -sn
+  name = Tim Clem
+  email = timothy.clem@gmail.com
+[github]
+	user = tclem
+	token = 30105e012899452fc53ec28c637d988f
 [color]
-        diff = auto
-        status = auto
-        branch = auto
+	ui = true
+[rerere]
+	enabled = true
+[alias]
+	lol = log --oneline --graph --decorate
 [core]
-        excludesfile = ~/.gitignore
-        editor = mate -w
-[apply]
-        whitespace = nowarn
-[github]
-        user = holman
-[mergetool]
-        keepBackup = false
\ No newline at end of file
+	autocrlf = input
+
diff --git a/jruby/aliases.zsh b/jruby/aliases.zsh
deleted file mode 100644
index b4bcdfc..0000000
--- a/jruby/aliases.zsh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Quick switch to 1.5.2
-alias j='rvm jruby-1.5.2'
diff --git a/mailplane/stylesheet.css b/mailplane/stylesheet.css
deleted file mode 100644
index 25865b9..0000000
--- a/mailplane/stylesheet.css
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Minimal Gmail/Mailplane User Stylesheet
-Copyright (C) 2009 Ryan Tomayko <tomayko.com/about>
-Copyright (C) BEFORE THAT, some other scros on the internet
-*/
-
-* {outline: none !important;}
-* {font-family: 'Lucida Grande', Tahoma, Verdana, Arial, Helvetica, sans-serif !important;}
-.l73JSe { color:#D19800 !important;text-decoration:none !important; }
-.oM { display:none; }
-
-
-/* Hide the links to other apps */
-#gbar { display:none }
-
-/* Put the settings links on the same level as the search box  */
-div.nH + div.nH div.nH.qp {
-  border: none;
-  line-height: 22px;
-  height: auto;
-  padding-top: 12px;
-  position: absolute;
-  right: 4px;
-  z-index: 100000000 !important;
-}
-
-/* Hide the "Manage this Domain Link" */
-span[id=':qf'] { display:none }
-
-/* Hide the G-mail Logo */
-div.nH + div.nH div.nH div.no div.nH.nn {
-  display: none;
-}
-div.nH + div.nH div.nH div.no div.nH.nn + div.nH.nn {
-  display: block;
-}
-
-/* Hide the "Search the Web" button */
-div[id=':r8'], div[id=':r9'] {
-  display: none !important;
-}
-
-/* Hide the footer */
-div.nH.l2.ov {
-  display: none;
-}
-
-/* Hide new window / print box */
-div.hj {
-  display: none;
-}
-table.iY > tr > td {
-  display: none;
-}
-table.iY > tr > td:first-child {
-  display: table-cell;
-}
-
-/* Fixed width font */
-.ii, .ii a {
-  font-family: Consolas, 'Dejavu Sans', monospace !important;
-  font-size:15px !important;
-}
\ No newline at end of file
diff --git a/netnewswire/reclining.nnwstyle/Info.plist b/netnewswire/reclining.nnwstyle/Info.plist
deleted file mode 100644
index 9b8149c..0000000
--- a/netnewswire/reclining.nnwstyle/Info.plist
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CreatorHomePage</key>
-	<string>http://github.com/holman/dotfiles</string>
-	<key>CreatorName</key>
-	<string>Zach Holman</string>
-	<key>Version</key>
-	<integer>1</integer>
-</dict>
-</plist>
\ No newline at end of file
diff --git a/netnewswire/reclining.nnwstyle/Readme.markdown b/netnewswire/reclining.nnwstyle/Readme.markdown
deleted file mode 100644
index 8cb8031..0000000
--- a/netnewswire/reclining.nnwstyle/Readme.markdown
+++ /dev/null
@@ -1,13 +0,0 @@
-# RECLINING: I'm getting used to it
-
-### A tidy little theme for NetNewsWire
-
-<a href="http://cl.ly/24QJ"><img src="http://cl.ly/24QJ/content" width="500" /></a>
-
-### Installation
-
-With you double-clicking on `reclining.nnwstyle`, there will be advantages to each.
-
-### Pow Pow
-
-Love, [@holman](http://twitter.com/holman).
diff --git a/netnewswire/reclining.nnwstyle/stylesheet.css b/netnewswire/reclining.nnwstyle/stylesheet.css
deleted file mode 100644
index fe3bbb1..0000000
--- a/netnewswire/reclining.nnwstyle/stylesheet.css
+++ /dev/null
@@ -1,69 +0,0 @@
-body{
-  margin: 0;
-  padding: 0;
-  -webkit-font-smoothing: antialiased;
-}
-#header{
-  background:
-    -webkit-gradient(linear, left top, left bottom, from(#F2F5FF), to(#C5E0E3));
-}
-#header{
-  color: #335054;
-  text-shadow: 1px 1px 0 #fff;
-  font-family: Helvetica, sans-serif;
-  padding: 10px 0 10px 30px;
-}
-#header #favicon{
-  float: right;
-}
-#header #favicon span{
-  visibility: hidden;
-}
-#header #favicon img{
-  margin-right: 10px;
-  visibility: visible;
-  float: right;
-  display: block;
-  border: 1px solid #fff;
-}
-#header .newsItemSource a{
-  font-size: 1.25em;
-  color: #335054;
-  text-decoration: none;
-  padding: 5px 10px 5px 0;
-}
-#header .newsItemSource img{
-  display: none;
-}
-#header .newsItemDate{
-  display: none;
-}
-#header .newsItemCreator{
-  color: #999;
-  padding-left: 3px;
-  font-size: .9em;
-}
-#blendsplit{
-  height: 7px;
-  background:
-    -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#fff));
-  border-top: 1px solid #95A8AB;
-  margin-bottom: 15px;
-}
-#content #title{
-  padding-bottom: 10px;
-}
-#content #title a{
-  color: #333;
-  font-size: 2.25em;
-  text-decoration: none;
-}
-#content #title .newsItemDate{
-  display: none;
-}
-#content #title .newsItemCreator{
-  display: none;
-}
-#content{
-  padding: .5em 30px;
-}
\ No newline at end of file
diff --git a/netnewswire/reclining.nnwstyle/template.html b/netnewswire/reclining.nnwstyle/template.html
deleted file mode 100644
index 6e32f58..0000000
--- a/netnewswire/reclining.nnwstyle/template.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="main">
-  <div id="header">
-    [[newsitem_dateline]]
-    <div id="favicon">[[newsitem_dateline]]</div>
-  </div>
-
-  <div id="blendsplit"></div>
-
-  <div id="content">
-    <div id="title">
-      [[newsitem_title]]
-    </div>
-
-    [[newsitem_description]]
-  </div>
-</div>
\ No newline at end of file
diff --git a/ruby/aliases.zsh b/ruby/aliases.zsh
index 2c3b441..4a4f086 100644
--- a/ruby/aliases.zsh
+++ b/ruby/aliases.zsh
@@ -1,7 +1,5 @@
 alias r='rvm use 1.8.7'
 
-alias f='RAILS_ENV=fi'
-
 alias sc='script/console'
 alias ss='script/server -p `available_rails_port`'
 alias sg='script/generate'
@@ -9,4 +7,7 @@ alias sd='script/destroy'
 
 alias migrate='rake db:migrate db:test:clone'
 
-alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
\ No newline at end of file
+alias s="ps aux | grep \"[r]uby\" | grep script/server || echo \"You're not running any, dawg.\""
+
+alias killnginx="ps aux | grep nginx | awk '{print $2}' | xargs sudo kill -9"
+
diff --git a/vim/gvimrc.symlink b/vim.old/gvimrc.symlink
similarity index 100%
rename from vim/gvimrc.symlink
rename to vim.old/gvimrc.symlink
diff --git a/vim/vim.symlink/.VimballRecord b/vim.old/vim.symlink/.VimballRecord
similarity index 100%
rename from vim/vim.symlink/.VimballRecord
rename to vim.old/vim.symlink/.VimballRecord
diff --git a/vim/vim.symlink/autoload/rails.vim b/vim.old/vim.symlink/autoload/rails.vim
similarity index 100%
rename from vim/vim.symlink/autoload/rails.vim
rename to vim.old/vim.symlink/autoload/rails.vim
diff --git a/vim/vim.symlink/colors/molokai.vim b/vim.old/vim.symlink/colors/molokai.vim
similarity index 100%
rename from vim/vim.symlink/colors/molokai.vim
rename to vim.old/vim.symlink/colors/molokai.vim
diff --git a/vim/vim.symlink/colors/railscasts.vim b/vim.old/vim.symlink/colors/railscasts.vim
similarity index 100%
rename from vim/vim.symlink/colors/railscasts.vim
rename to vim.old/vim.symlink/colors/railscasts.vim
diff --git a/vim/vim.symlink/doc/command-t.txt b/vim.old/vim.symlink/doc/command-t.txt
similarity index 100%
rename from vim/vim.symlink/doc/command-t.txt
rename to vim.old/vim.symlink/doc/command-t.txt
diff --git a/vim/vim.symlink/doc/rails.txt b/vim.old/vim.symlink/doc/rails.txt
similarity index 100%
rename from vim/vim.symlink/doc/rails.txt
rename to vim.old/vim.symlink/doc/rails.txt
diff --git a/vim/vim.symlink/doc/tags b/vim.old/vim.symlink/doc/tags
similarity index 100%
rename from vim/vim.symlink/doc/tags
rename to vim.old/vim.symlink/doc/tags
diff --git a/vim/vim.symlink/filetype.vim b/vim.old/vim.symlink/filetype.vim
similarity index 100%
rename from vim/vim.symlink/filetype.vim
rename to vim.old/vim.symlink/filetype.vim
diff --git a/vim/vim.symlink/ftdetect/markdown.vim b/vim.old/vim.symlink/ftdetect/markdown.vim
similarity index 100%
rename from vim/vim.symlink/ftdetect/markdown.vim
rename to vim.old/vim.symlink/ftdetect/markdown.vim
diff --git a/vim/vim.symlink/plugin/command-t.vim b/vim.old/vim.symlink/plugin/command-t.vim
similarity index 100%
rename from vim/vim.symlink/plugin/command-t.vim
rename to vim.old/vim.symlink/plugin/command-t.vim
diff --git a/vim/vim.symlink/plugin/gitignore.vim b/vim.old/vim.symlink/plugin/gitignore.vim
similarity index 100%
rename from vim/vim.symlink/plugin/gitignore.vim
rename to vim.old/vim.symlink/plugin/gitignore.vim
diff --git a/vim/vim.symlink/plugin/rails.vim b/vim.old/vim.symlink/plugin/rails.vim
similarity index 100%
rename from vim/vim.symlink/plugin/rails.vim
rename to vim.old/vim.symlink/plugin/rails.vim
diff --git a/vim/vim.symlink/ruby/command-t/Makefile b/vim.old/vim.symlink/ruby/command-t/Makefile
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/Makefile
rename to vim.old/vim.symlink/ruby/command-t/Makefile
diff --git a/vim/vim.symlink/ruby/command-t/controller.rb b/vim.old/vim.symlink/ruby/command-t/controller.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/controller.rb
rename to vim.old/vim.symlink/ruby/command-t/controller.rb
diff --git a/vim/vim.symlink/ruby/command-t/depend b/vim.old/vim.symlink/ruby/command-t/depend
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/depend
rename to vim.old/vim.symlink/ruby/command-t/depend
diff --git a/vim/vim.symlink/ruby/command-t/ext.bundle b/vim.old/vim.symlink/ruby/command-t/ext.bundle
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/ext.bundle
rename to vim.old/vim.symlink/ruby/command-t/ext.bundle
diff --git a/vim/vim.symlink/ruby/command-t/ext.c b/vim.old/vim.symlink/ruby/command-t/ext.c
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/ext.c
rename to vim.old/vim.symlink/ruby/command-t/ext.c
diff --git a/vim/vim.symlink/ruby/command-t/ext.h b/vim.old/vim.symlink/ruby/command-t/ext.h
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/ext.h
rename to vim.old/vim.symlink/ruby/command-t/ext.h
diff --git a/vim/vim.symlink/ruby/command-t/ext.o b/vim.old/vim.symlink/ruby/command-t/ext.o
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/ext.o
rename to vim.old/vim.symlink/ruby/command-t/ext.o
diff --git a/vim/vim.symlink/ruby/command-t/extconf.rb b/vim.old/vim.symlink/ruby/command-t/extconf.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/extconf.rb
rename to vim.old/vim.symlink/ruby/command-t/extconf.rb
diff --git a/vim/vim.symlink/ruby/command-t/finder.rb b/vim.old/vim.symlink/ruby/command-t/finder.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/finder.rb
rename to vim.old/vim.symlink/ruby/command-t/finder.rb
diff --git a/vim/vim.symlink/ruby/command-t/match.c b/vim.old/vim.symlink/ruby/command-t/match.c
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/match.c
rename to vim.old/vim.symlink/ruby/command-t/match.c
diff --git a/vim/vim.symlink/ruby/command-t/match.h b/vim.old/vim.symlink/ruby/command-t/match.h
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/match.h
rename to vim.old/vim.symlink/ruby/command-t/match.h
diff --git a/vim/vim.symlink/ruby/command-t/match.o b/vim.old/vim.symlink/ruby/command-t/match.o
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/match.o
rename to vim.old/vim.symlink/ruby/command-t/match.o
diff --git a/vim/vim.symlink/ruby/command-t/match_window.rb b/vim.old/vim.symlink/ruby/command-t/match_window.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/match_window.rb
rename to vim.old/vim.symlink/ruby/command-t/match_window.rb
diff --git a/vim/vim.symlink/ruby/command-t/matcher.c b/vim.old/vim.symlink/ruby/command-t/matcher.c
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/matcher.c
rename to vim.old/vim.symlink/ruby/command-t/matcher.c
diff --git a/vim/vim.symlink/ruby/command-t/matcher.h b/vim.old/vim.symlink/ruby/command-t/matcher.h
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/matcher.h
rename to vim.old/vim.symlink/ruby/command-t/matcher.h
diff --git a/vim/vim.symlink/ruby/command-t/matcher.o b/vim.old/vim.symlink/ruby/command-t/matcher.o
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/matcher.o
rename to vim.old/vim.symlink/ruby/command-t/matcher.o
diff --git a/vim/vim.symlink/ruby/command-t/mkmf.log b/vim.old/vim.symlink/ruby/command-t/mkmf.log
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/mkmf.log
rename to vim.old/vim.symlink/ruby/command-t/mkmf.log
diff --git a/vim/vim.symlink/ruby/command-t/prompt.rb b/vim.old/vim.symlink/ruby/command-t/prompt.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/prompt.rb
rename to vim.old/vim.symlink/ruby/command-t/prompt.rb
diff --git a/vim/vim.symlink/ruby/command-t/ruby_compat.h b/vim.old/vim.symlink/ruby/command-t/ruby_compat.h
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/ruby_compat.h
rename to vim.old/vim.symlink/ruby/command-t/ruby_compat.h
diff --git a/vim/vim.symlink/ruby/command-t/scanner.rb b/vim.old/vim.symlink/ruby/command-t/scanner.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/scanner.rb
rename to vim.old/vim.symlink/ruby/command-t/scanner.rb
diff --git a/vim/vim.symlink/ruby/command-t/settings.rb b/vim.old/vim.symlink/ruby/command-t/settings.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/settings.rb
rename to vim.old/vim.symlink/ruby/command-t/settings.rb
diff --git a/vim/vim.symlink/ruby/command-t/stub.rb b/vim.old/vim.symlink/ruby/command-t/stub.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/stub.rb
rename to vim.old/vim.symlink/ruby/command-t/stub.rb
diff --git a/vim/vim.symlink/ruby/command-t/vim.rb b/vim.old/vim.symlink/ruby/command-t/vim.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/vim.rb
rename to vim.old/vim.symlink/ruby/command-t/vim.rb
diff --git a/vim/vim.symlink/ruby/command-t/vim/screen.rb b/vim.old/vim.symlink/ruby/command-t/vim/screen.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/vim/screen.rb
rename to vim.old/vim.symlink/ruby/command-t/vim/screen.rb
diff --git a/vim/vim.symlink/ruby/command-t/vim/window.rb b/vim.old/vim.symlink/ruby/command-t/vim/window.rb
similarity index 100%
rename from vim/vim.symlink/ruby/command-t/vim/window.rb
rename to vim.old/vim.symlink/ruby/command-t/vim/window.rb
diff --git a/vim/vim.symlink/snippets/markdown.snippets b/vim.old/vim.symlink/snippets/markdown.snippets
similarity index 100%
rename from vim/vim.symlink/snippets/markdown.snippets
rename to vim.old/vim.symlink/snippets/markdown.snippets
diff --git a/vim/vim.symlink/syntax/markdown.vim b/vim.old/vim.symlink/syntax/markdown.vim
similarity index 100%
rename from vim/vim.symlink/syntax/markdown.vim
rename to vim.old/vim.symlink/syntax/markdown.vim
diff --git a/vim/vim.symlink/syntax/mustache.vim b/vim.old/vim.symlink/syntax/mustache.vim
similarity index 100%
rename from vim/vim.symlink/syntax/mustache.vim
rename to vim.old/vim.symlink/syntax/mustache.vim
diff --git a/vim/vimrc.symlink b/vim.old/vimrc.symlink
similarity index 100%
rename from vim/vimrc.symlink
rename to vim.old/vimrc.symlink
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index cf94029..275c95e 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,4 +1,5 @@
 alias dotmate='mate $ZSH'
 alias dotcd='cd $ZSH'
 
-alias reload!='. ~/.zshrc'
\ No newline at end of file
+alias reload!='. ~/.zshrc'
+alias v=mvim
diff --git a/zsh/completion.zsh b/zsh/completion.zsh
index 1862eec..8969384 100644
--- a/zsh/completion.zsh
+++ b/zsh/completion.zsh
@@ -3,3 +3,7 @@ zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}'
 
 # pasting with tabs doesn't perform completion
 zstyle ':completion:*' insert-tab pending
+
+# tab completion colors
+zstyle ':completion:*' list-colors ''
+#zstyle ':completion:*' list-colors ${(s.:.)LSCOLORS}
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 199f1ed..533ead0 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -22,13 +22,13 @@ git_dirty() {
 }
 
 git_prompt_info () {
- ref=$(git symbolic-ref HEAD 2>/dev/null) || return
+  ref=$(git symbolic-ref HEAD 2>/dev/null) || return
 # echo "(%{\e[0;33m%}${ref#refs/heads/}%{\e[0m%})"
- echo "${ref#refs/heads/}"
+  echo "${ref#refs/heads/}"
 }
 
 project_name () {
-  name=$(pwd | awk -F'Development/' '{print $2}' | awk -F/ '{print $1}')
+  name=$(pwd | awk -F'GitHub/' '{print $2}' | awk -F/ '{print $1}')
   echo $name
 }
 
@@ -44,9 +44,9 @@ unpushed () {
 need_push () {
   if [[ $(unpushed) == "" ]]
   then
-    echo " "
+    echo ""
   else
-    echo "with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
+    echo " with %{$fg_bold[magenta]%}unpushed%{$reset_color%}"
   fi
 }
 
@@ -63,11 +63,9 @@ directory_name(){
   echo "%{$fg_bold[cyan]%}%1/%\/%{$reset_color%}"
 }
 
-export PROMPT=$'\n$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty) $(need_push)\n› '
-set_prompt () {
-  export RPROMPT=""
-}
+date_time='%D{%m.%d.%Y} %@'
+
+export PROMPT=$'$(rvm_prompt) in $(directory_name) $(project_name_color)$(git_dirty)$(need_push)\n%% '
+#export RPROMPT=$'$date_time'
+export RPROMPT=""
 
-precmd() {
-  set_prompt
-}