Implement DescoveryItem
Merge branch 'master' of github.com:Vagrants/blackbird into development