new data model figure
improving ProxifyServiceTest, and using new airline version
Merge branch 'master' of https://github.com/choreos/choreos_middleware