Merge pull request #1 from peternewman/master

Fix the buildbot config to work with github