Update version of dataflow we depend on.

The primary change needed to accomodate the new dataflow api is to how we
handle side inputs.
A lot of the diff here is going from 4 to 2 space indent. That's intentional? I think it's fine; I prefer 2 space myself.