Pointed remaining license references to new HTML license.
Resolved merge conflicts.
Merge pull request #18 from pjackson28/master

Pointed remaining license references to new HTML license