More tweaks to get buildbot running smoothly
Merge pull request #125 from sfoley/master

More tweaks to get buildbot running smoothly