Changed resolveInfoForIntent member into a TreeSet and wrote an IntentComparator that defines a total order over all Intents (still need to add support for categories).  Does not break any current tests