Removed json2, moved locked to top of file, added license