Update for flow-networking changes

This won't compile because flow-networking changes are still in a branch.
DON'T PULL UNTIL THAT BRANCH IS IN MASTER, k thanks.

Signed-off-by: Jack Huey kitskub@gmail.com