Initial migration from chef.git
Merge remote-tracking branch 'github/master'

Conflicts were all about the Fedora things that I hadn't merged upstream.

Conflicts:
	README.md
	metadata.rb
	recipes/server.rb
	templates/default/redis.conf.erb