Merging with Yorba.

Merging with today's Yorba.  Maybe I'll hack at removing some of the DB code later.
-Joe