Correct trapezoid centroid calc to include any x offset.
Composite antecedent propositions; weapon-choice example; verbosity; add'l readme items.
Merge branch 'weapons'