Fix an issue where devices with a single child were still (incorrectly) listing the parent device as well.
Add a fix for differentiating between USB and SCSI devices (still needs testing with a SCSI device, but it is a relatively minor change and should work)
Merge branch 'master' of github.com:pcbsd/pcbsd