Reasserts the Unique constraint on UnitStats.  Reverts 65e2d82149e140c07ab80d632a68029e7ac3a6d2 to close #246.
Merge branch 'master' into output_names
Major: Removes mentions of "All" from the output model spec and output_parser.  #223
Updated xml2sqlite script to make sure that include_direct_contact_spread and include_indirect_contact_spread are False when those modes of spread are not used.
Merge branch 'master' into output_names