changes to generate scripts
Merge branch 'master' of https://github.com/gbgg/aama-data

Changes to 'generate' scripts.