Whoops, bug when I moved the data directory.  Need to build some unit tests for this stuff.