# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1272740657 14400
# Node ID bc6875651950eb706e48a657e0fb240a48d71c58
# Parent  c37b42fc84097f1ef149996462a68db2a305dab7# Parent  3a5a19f5dd1fa3a86cfd906e7ae2b32d92918084
Merge.

diff -r c37b42fc8409 -r bc6875651950 .gitconfig
--- a/.gitconfig	Sat May 01 15:04:04 2010 -0400
+++ b/.gitconfig	Sat May 01 15:04:17 2010 -0400
@@ -26,3 +26,8 @@
 diff = auto
 interactive = auto
 status = auto
+
+[codebase]
+username = steve
+apikey = zl2b3od1ln9g23438nhvug0yoppe5lkia9ro3pun
+domain = dwaiter.codebasehq.com
diff -r c37b42fc8409 -r bc6875651950 .zshrc
--- a/.zshrc	Sat May 01 15:04:04 2010 -0400
+++ b/.zshrc	Sat May 01 15:04:17 2010 -0400
@@ -7,24 +7,10 @@
 unsetopt promptcr
 
 # Useful aliases -------------------------------------------------------------
-alias ls='ls -Goh'
-alias less='less -R'
-alias hl='less -R'
-alias pm='python manage.py'
-alias oo='open .'
 alias j='z'
 alias fab='fab -i ~/.ssh/stevelosh'
 alias tweets-stevelosh='~/src/grabtweets/grabtweets.py -p ~/Documents/tweets/stevelosh'
-alias meme="curl -q --silent meme.boxofjunk.ws/moar.txt?lines=1"
-alias deact='deactivate'
-alias serve_this='python -m SimpleHTTPServer'
 alias oldgcc='export CC=/usr/bin/gcc-4.0'
-alias smtpconsole='python -m smtpd -n -c DebuggingServer localhost:1025'
-alias fic='~/src/fictiongen/generate.py -c 5 | pbcopy'
-alias ficp='~/src/fictiongen/generate.py -p -c 5 | pbcopy'
-alias fict='~/src/fictiongen/generate.py -t | pbcopy'
-alias gs='gunicorn_django'
-alias gk='kill `cat .gunicorn.pid`'
 
 # Environment variables ------------------------------------------------------
 export EDITOR='vim'
@@ -38,7 +24,6 @@
 export HISTSIZE=1000
 export HISTFILESIZE=1000
 export HISTCONTROL=erasedups
-export JPY="${HOME}/lib/j2/j.py"
 export PYTHONSTARTUP="$HOME/.pythonrc.py"
 export COMMAND_MODE=unix2003
 export R_LIBS="$HOME/lib/r"
@@ -53,9 +38,8 @@
 source ~/lib/z/z.sh
 source ~/lib/python/virtualenvwrapper/virtualenvwrapper.sh
 
-# Gorilla --------------------------------------------------------------------
-export PATH="/Users/sjl/src/gorilla/bin:$PATH"
-export PYTHONPATH="/Users/sjl/src/gorilla/lib:$PYTHONPATH"
+# See ------------------------------------------------------------------------
+export PYTHONPATH="$HOME/lib/python/see:$PYTHONPATH"
 
 # Pre-Prompt Command ---------------------------------------------------------
 function precmd () {