Merge branch 'dd_handler_gem_version' of https://github.com/zendesk/chef-datadog into zendesk-dd_handler_gem_version

Handled some conflicts in the attributes file

Conflicts:
	attributes/default.rb