Add back in bug-buddy, which was removed from marcuscom merge a while back, needed in
some cases still