Fixing cookbooks

@jesseadams These are the changes I started a bit back. Feel free to merge/cherry-pick/reject as you please.