Adjustments to style discovery

While hashing out ideas on IRC and writing up the 2.x docs, a couple of things came to light:

1) There is no safeguard for styles that don't inherit from Naked as the ultimate base style. Need to make that an implicit style for template files.

2) Including a style in a theme is problematic because of the naming. Need to add in the style name to the file names.

Michelle