Get rid of group/device distinction

[bwhite]

We may want more complex groups like android:glass:mac like we are using now, so we should just have "device".