I've spoken with electrical about this in the past and I think i'm on the side of not merging it until we have the ability to do some kind of puppet module generate `profile`, where we can have multiple profiles (or skeletons or whatever we call them).  I think once that's in place we can drop in several profiles and go from there, rather than trying to pick the perfect set of defaults.

I'm just heading to bed but tomorrow I'll run through this, review it more extensively, and see what we can do in the meantime until we can have multiple skeletons.