Added Choice policy constructor
(cherry picked from commit d1936042a9d15e3d875f74a84954c660bd6d0dba)
Added Choice to dehopification
Fixed (a) sequential composition bug
Merge pull request #121 from jnfoster/master

Bug fixes
Added dataflowesque optimizations, much more scalable. Also reduced number of tags generated
merge