Merging

added git://github.com/nationalfield/opsworks-cookbooks.git