Merging with with-replicas, take 1
Merge branch 'master' of github.com:choreos/choreos_middleware
Merging with with-replicas, take 2
Removed duplicated files
Merging with 'with-replicas' branch done