Baby steps to update choreography. (2)
Changing names
Merge branch 'master' of github.com:choreos/choreos_middleware