Make tests pass on buildbot more of the time
Merge pull request #202 from basho/adt-buildbot-fixes

Make tests pass on buildbot more of the time