Merge in recent stuff

0ba398f9 · James Smith · a15a8c4a · a738ca9b · 0ba398f9 · 0ba398f9
Commit 0ba398f9 authored Aug 01, 2011 by James Smith
--- a/themes/trapd00r.zsh-theme
+++ b/themes/trapd00r.zsh-theme
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
--- a/tools/check_for_upgrade.sh
+++ b/tools/check_for_upgrade.sh
--- a/tools/install.sh
+++ b/tools/install.sh
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh