Added more Opscode cookbooks.
Cleaned up webserver recipe.
Added Unicorn.
Resolved merge conflicts.