Refactor panopticon registration to explictly handle dupe flows

- Builds hashes of both sets of flows and merges, choosing Smartdown in the event of a duplicate