Update to work with recent vumi

A lot has changed in vumi in the past year and a half.