Updated project to using berkfile
Merge branch 'master' of github.com:Groople/opsworks-cookbooks

Conflicts:
	opsworks_custom_config