changes to initialization files and scripts to match recent changes to the software. not complete and software and tests don't yet work
Merge remote-tracking branch 'upstream/master'