build and include scripts now read from a single JSON file.
More tests converted
Merge remote-tracking branch 'origin/master'