Merge pull request #62 from interactiveinstitute/develop

Make master work again
Update elvis
Update elvis
Check for deviceTypeString if manufacturer info is unavailable

It looks like some plugs are never setting their manufacturerId and
manufacturerProductType. If plugs also exist that don’t set
deviceTypeString, we’ll just need to assume that every device with ID
unequal to 1 is a plug.
Complete the previous commit