Combine entries for same dev different conn type.

Combines entries for the same device that is available on different
connection types. Fixes #3.