Catch up

includes test fixes for bamboo v0.6.1 and some additional functionality for the past couple bamboo releases.