Import redis version 3.0.4
Import runit version 1.2.0
Import build-essential version 1.4.2
Import yum version 2.3.2
Import install_from version 3.0.4
Import metachef version 3.0.4
added back .chef
fdgfd
Merge branch 'master' into rails-instance

Conflicts:
	.chef/knife.rb
	Berksfile
	Berksfile.lock