in progress
Merge branch 'spark' of github.com:tnelson/FlowLog into spark