`FlowBuilder.merge` not accepting another builder is confusing

[jqmp]

trafficstars

The FlowBuilder.merge method excepts a flow, not a builder, which seems to be a common source of surprise. What's worse, if you pass it a builder you get a cryptic error message about not having a name attribute.

We should either check the type and raise a clearer exception, or just accept a builder as well.