Fix up the Riff-Raff integration

This rewrites the data collector to use JSON files, and unifies the collector with the new instance / hardware / security group work.

As a result we can trash all of the old deploy info code.