Demo Changes

This pull request includes several changes that were made while developing the ONS demo, most of which were refactorings. One significant changes was to the behavior of host discovery, which now only attempts to discover hosts on "pending" ports, and will discover multiple hosts on the same port (necessary for wifi networks).