Added .gdbinit
Merge remote-tracking branch 'origin/master' into marvin

Just updating marvin
Added vim Pyclewn wrapper and nextval plugin
Merge branch 'master' of github.com:daniel-noland/config
Removed broken scripts
Merge remote-tracking branch 'origin/navi' into mike

Catching Mike up with the latest news.
Merge remote-tracking branch 'origin/marvin' into mike

Syncing mike with marvin
Added sage configuration to .shellrc
Merge remote-tracking branch 'origin/mike'
Added bundle / unbundle and recursive extract

New .shellrc functions.  They still need a lot of testing.
Touched up rxtr and unbundle.  Added color output.

unbundle should now generate color output to indicate the success or
failure of each hash / check.
Added diffconfilict as default git merge tool