temporary changes to make blip compatible with current master branch of tideline

I wanted to make sure we could tag tideline and update blip to use the new tideline for a potential deploy; these are the changes required to do that. Don't think too hard about them please; guaranteed to change.

With these changes, master of tideline can be tagged (with the version blip depends on updated here, of course) and (a) deployed with full functionality on staging (assuming no change to version of jellyfish on staging) and (b) deployed with partial functionality on devel, no worse than current situation on devel (functionality will be partial because of bugs in current jellyfish on devel).

@nicolashery merge if it looks OK to you?

CC: @kentquirk re: our discussion of deploy dependencies.