Switch to 2-clause license and standard text

Approved by:	bms@