Bump to Mirage 2 and add Conduit/Resolver interfaces