including integration with choreography enactment
Merge branch 'master' of github.com:choreos/choreos_v-v