Updating cookbook dependencies.
Merge branch 'master' of github.com:TouchBistro/opsworks-cookbooks

Conflicts:
	Berksfile