Add tools-stream config to allow tools from different streams to be used
Fix yucky code
Add deprecation warning
Merge pull request #805 from wallyworld/tools-stream

Add tools-stream config to allow tools from different streams to be used