fix compile issues on some machines by including
the bits/ include subdir directly in the repo.
also added -Ibits to the Makefile.
Merge branch 'diffbot-testing' into testing