Develop

I think I found a missing `end` in the default recipe. There also seems to be some @chrisroberts changes in here as well that I hadn't reviewed.