rearrangements in support of integration with msg
Merge branch 'droom2' of github.com:spanner/droom into droom2