Merge branch 'merge_Lea' into utca

Revert "experimental commit"

This reverts commit 44c0582.

merge svn trunk

messed up escaping the ampersands

last from Keith -- fix to channel map test

fix script

On to BpO

dynrng is default

keith latest

grep just the phases out of the log file