adjusting generated JSON

about to mess with timeblock comments, They're "eating" the start time
of the next time block
modified JSON output format
merged grammar into master