Merge branch 'shain/aix_testing' of github.com:opscode/omnibus-chef into shain/aix_testing

Conflicts:
	config/projects/chef.rb
	config/software/chef.rb