Merged in Sean Herrons modifications to allow a data.json per organization to be generated