Tweak thread/worker counts
Restructure ES template
Merge branch 'master' of github.com:davidski/cookbooks