fix includes
fix scons #51
make unittests output TAP #51
send diagnostic info to stderr to work better with TAP #51
Merge branch 'diverge'

Conflicts:
	src/mongo/bson/util/builder.h
	src/mongo/unittest/unittest_main.cpp