Combined data-class and data-id into data-target for single attribute

[kwilkins]

Bringing this in line with how the master/foundation branch handles a setting a target