type/subtype, not composite/discrete

ugh
dzilify and 5.6-ify
update changelog
v1.016

          correct the longstanding and embarrassing misuse of "discrete" and
          "composite" to mean "type" and "subtype"; the returned data still
          contains the wrong old names so your code shouldn't break

          repackage to update bugtracker, repo, etc.