version bump
Switch to package_options from package_overrides
Merge branch 'master' of github.com:rcbops-cookbooks/collectd into havana

Conflicts:
	metadata.rb