Wrapping stacked checkables in a div with their type

Also adds tests for disabled
Applying braces to conditional
Merge pull request #376 from weotch/patch-5

Wrapping stacked checkables in a div with their type