cleaned up model generator
Merge branch 'master' of git://github.com/paul-headington/OnyxSystem