Use std::make_pair, rather than the std::pair contructor.
Use google logging instead of assert.h.
Small improvement in how FileDB lookups return entries.
DO NOT MERGE.