Update knife and localhost example
Merge branch 'master' of https://github.com/coletivoEITA/chef-repo

Conflicts:
	nodes/localhost.json