Update to latest resolver, remove Resolver monkey patches.
Merge pull request #156 from rjackson/update_resolver

Update to latest resolver, remove Resolver monkey patches.