Chef fixes
Merge branch 'master' of github.com:codebynumbers/profile

Conflicts:
	Linux/environment.conf