Consistent use of "metric", "diagnostic", "figure of merit" etc

[drphilmarshall]

I wrote the definitions of these things out in the introduction, so I guess it's now my job to make sure they are being used correctly throughout the paper. Watch out for targeted issues, if I make edits that need checking...