Storm updates

The biggest change here is in the template - I've moved the recipe to a cookbook specific template to avoid breakage from template evolution in the future.

Also jumped on a bunch of first person -> second person fixes.