modified demo7 to use new convention. Results match old but not *perfectly*, investigating...
hmmm checked that the small difference isn't due to entering the values wrong, likely due to the change in GSParams from previous runs of this demo.  Looks good enough to me so will revert this commit asap...
Revert "hmmm checked that the small difference isn't due to entering the values wrong, likely due to the change in GSParams from previous runs of this demo.  Looks good enough to me so will revert this commit asap..."

This reverts commit 825fa35b756a520550dc51465d73154edee8fa77.
Revert "modified demo7 to use new convention. Results match old but not *perfectly*, investigating..."

This reverts commit 7815050ff842b4e0770c25d535e407bd2f769848.
Merge branch 'master' into #325