Revert, and convert prop arrays to single elements

Reverted prior change (it didn't do what I was hoping).
Convert outgoing models to swagger-core compatible, that is no "type" arrays. 
Uses the convention that the first type is the type to be used.