updates to chef
Merge branch 'master' of https://github.com/zaelab/zaf-chef

Conflicts:
	Vagrantfile