Merge pull request #124 from sfoley/master

Fixing buildbot tests
More tweaks to get buildbot running smoothly