Update trait dictionary

[ehwenk]

• Update traits.yml from current APD
• Make minor changes to script to use APD output files, rather than inputs