Update Tender

Update mergeStrategies, do codelists, rename properties, fix patternProperties, and fix some
descriptions.

Fixes #162 (amongst other things)