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