Added data-contents-only support, based on kelvinhammond's attempt to do the same.

This one passes all the unit tests, including new unit tests for the feature.