Add buildbot integration and some other small cleanup