Merge remote-tracking branch 'origin/master' into making-cron-configurable

Conflicts:
	.gitignore
	attributes/default.rb
	metadata.rb
	recipes/default.rb