Service Discovery Now Works

Big improvement as far as service discovery goes. UI has to be designed.
Misc Changes
Merge pull request #6 from Boggartfly/SNAPSHOT

Snapshot