pulled and merged upstream changes

lib/functions.zsh

@@ -5,7 +5,7 @@ function title {
     print -nR $'\033k'$1$'\033'\\\
 
     print -nR $'\033]0;'$2$'\a'
-  elif [[ $TERM == "xterm" || $TERM == "rxvt" ]]; then
+  elif [[ ($TERM =~ "^xterm") ]] || [[ ($TERM == "rxvt") ]]; then
     # Use this one instead for XTerms:
     print -nR $'\033]0;'$*$'\a'
   fi
@@ -37,6 +37,7 @@ function take() {
   mkdir -p $1
   cd $1
 }
+<<<<<<< HEAD
 
 function logview() {
     if [ -x $(which ccze) ]; then
@@ -54,3 +55,5 @@ function logtail() {
     fi
 }
 
+=======
+>>>>>>> upstream/master