Updated CHECKLIST.txt and minor updates to jsongen.erl
Merge