Updated Dockerfile and Buildbot config