Merged in classes from Hagers branch of Streams.  Added changes to conform to our data models and timeouts
Merge pull request #72 from w2ogroup/link_resolver

Merged in classes from Hagers branch of Streams.  Added changes to confo...