Merge branch 'OBrienCommaJosh/chef'

Conflicts:
	CHANGELOG.md