Pointed remaining license references to new HTML license.
Resolved merge conflicts.