streaming bugfix
added varint dependency to ruby driver
Fix for #1824, CR 1107
fixing resunder daemon to work with ipv6
changing text of multiple_choices_exc_t message to be more helpful
fixing crash when changing conflicted semilattice value without resolve
Merge branch '1796_streaming_bugfix' into next
Merge branch 'next' of github.com:rethinkdb/rethinkdb into next
Merge branch 'next' into sam_alt
Merge branch 'sam_alt' into sam_alt_snap