update
Merge branch 'master' of https://github.com/joesoh-star/cookbooks

Conflicts:
	newrelic/Berksfile