ECS minor update

- encouraged use of signature_matcher_bitset - signature_matcher is
commented out
- declared assemblage_bucket macro
- option macros changed to uppercase