Always include a caption

I have a site where we always want the caption to appear if the title is provided. Most forget to add the class. The attached module does this and takes the alignment from either align or the style. It does not remove these so the caption CSS should include clear:both.

An alternative would be to add options to the existing filter but that makes them more complicated.