Attribute cleanup part 2

[brg468]

Part two of attribute cleanup. This PR contains all of the changes from the first plus adds MAC info to the devices and removes it from attributes, as well as model number, which is also show on device page. Keeping these separate PR's for now but I can close the first if we decide all the changes are acceptable.