reverting somethings in AWS cp: not use registry
puting a timeout to upload cookbook
Merge branch 'master' of https://github.com/choreos/choreos_middleware