Merge branch 'gh/opscode/omnibus-ruby/master' into feature/check_so_files_on_osx

Conflicts:
	lib/omnibus/health_check.rb