Fixed bugs/typos in license model
Updates to pjson emitter
Address model cleanup
Merge branch 'my'