Changes for new cuttlefish api

needs basho/cuttlefish#87 to work right.