Allow discover to search for specific types

Allow the GatewayDiscover to search for specific types of Gateways.

*Note:* sorry for these multiple commits, it appears Github doesn't support amending commits after a push...