Update generic device type
Merge branch 'master' of https://github.com/ninjablocks/ninja-toolbelt