# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1288904868 14400
# Node ID 95ec2bfa74b6c2da4f598f9905553a7477d56c3a
# Parent  d3e0c0c7ff376d0266a806c8d4470b41aae5ecde# Parent  f5178198080a29d4ca3c41df4f999b7ec2f75e25
Merge.

diff -r f5178198080a -r 95ec2bfa74b6 .hgrc
--- a/.hgrc	Tue Nov 02 18:23:07 2010 -0400
+++ b/.hgrc	Thu Nov 04 17:07:48 2010 -0400
@@ -138,6 +138,8 @@
           echo '*.swp'        >> .hgignore && \
           echo '*.swo'        >> .hgignore && \
           echo '*.un~'        >> .hgignore && \
+          echo '.ropeproject' >> .hgignore && \
+          echo 'tags'         >> .hgignore && \
           echo "[paths]\n" >> .hg/hgrc
 
 # Empty the current MQ patch.
diff -r f5178198080a -r 95ec2bfa74b6 mutt/offlineimapsync.sh
--- a/mutt/offlineimapsync.sh	Tue Nov 02 18:23:07 2010 -0400
+++ b/mutt/offlineimapsync.sh	Thu Nov 04 17:07:48 2010 -0400
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-PID=`/usr/local/bin/pgrep offlineimap`
-
-[[ -n "$PID" ]] && kill $PID
+PID=`cat ~/.offlineimap/pid`
+ps aux | grep "[ ]$PID" && kill $PID
 
 /usr/local/bin/offlineimap -o -u Noninteractive.Quiet &>/dev/null &
 
diff -r f5178198080a -r 95ec2bfa74b6 mutt/offlineimapsyncquick.sh
--- a/mutt/offlineimapsyncquick.sh	Tue Nov 02 18:23:07 2010 -0400
+++ b/mutt/offlineimapsyncquick.sh	Thu Nov 04 17:07:48 2010 -0400
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-PID=`/usr/local/bin/pgrep offlineimap`
-
-[[ -n "$PID" ]] && kill $PID
+PID=`cat ~/.offlineimap/pid`
+ps aux | grep "[ ]$PID" && kill $PID
 
 /usr/local/bin/offlineimap -q -o -u Noninteractive.Quiet &>/dev/null &
 
diff -r f5178198080a -r 95ec2bfa74b6 vim/.vimrc
--- a/vim/.vimrc	Tue Nov 02 18:23:07 2010 -0400
+++ b/vim/.vimrc	Thu Nov 04 17:07:48 2010 -0400
@@ -32,6 +32,9 @@
 set undofile
 set undoreload=10000
 
+" Status line
+set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c)
+
 " Backups
 set backupdir=~/.vim/tmp/backup// " backups
 set directory=~/.vim/tmp/swap//   " swap files