added manufacturer method
Testing
Fixed testing
properly merged data
updated specs
Merge branch 'master' of github.com:FifthSurprise/DeviceSniffer