Fix to make discovery use new services format - UNTESTED
Change from device_id to model and firmware_version to version
Merge pull request #3 from CaptChrisD/fix_discovery

Fix to make discovery use new services format - UNTESTED