Conflicts:
	buildheader/make_tdb.cc

Conflicts:
	buildheader/make_tdb.cc
	portability/toku_assert.cc
	src/ydb.cc

fixes #201

update TokuMergeLibs to support Tokutek/mongo#983

abstractions and strengthen others, with an eye for simplicity and
consistency, not over-encapsulation.

We needed to be more careful about extracting archives which may
contain multiple objects with the same name.

Modified watch.stress-tests.bash script so that it correctly computes the sum of ALL tests passing and failing

compilations).

external projects (such as TokuMX)

simplify things. New OMTs will use the new templated API, or, when
performance is not critical, use something simple like a std::map

stuff into portability/

useful definition directly into make_tdb.cc (which generates db.h)

test to catch bugs like these in the future.

    old time new time
10k    20     12
20k    34     23
40k   192     45
80k  1388     71

the rest of the code