Fixed the rest of the buildbot issues.
Merge pull request #84 from bearbin/botfixes

Fixed the rest of the buildbot issues.