Merge pull request #12 from mverzett/master

Updates
many updates
added machinery to build a cut flow table
changed names