Service discovery, upgrades to libraries.
Merge pull request #1 from dclements/discovery

Service discovery, upgrades to libraries.