Switch make_cylinder.py to new JSON format and update cylinder layouts

As before, gotta scroll all the way down in the Files Changed tab to see the code changes.