Merging master again because I am git challenged.
Merging master again because I am git challenged.

Conflicts:
	recipes/binary.rb
	recipes/service.rb
	spec/unit/recipes/default_spec.rb
	test/integration/bluepill-binary/serverspec/binary_spec.rb
	test/integration/init-binary/serverspec/binary_spec.rb

rayrod2030/chef-prometheus,rayrod2030/chef-prometheus,elijah/chef-prometheus,elijah/chef-prometheus,elijah/chef-prometheus,rayrod2030/chef-prometheus