Fixed failing test that now depends on there /not/ being a trailing slash in the declaration of the foreign resource's base url.
Added an async call to a block after a hard fetch! on a resource, so that you have some way of knowing when the request has completed.
changed the format of the conflict array from [{old: :x,new: :y},...] to [{local: :x,foreign: :y},...]. Much more appropriate.