refactor around deployment strategy
Merge branch 'refactor-deploy-cookbooks' into develop