Use attribute names as object names in json. No more manual "plucking" of data attribtues

Addresses issues #15 and #19