Map correctly from string to resource in 3.3.0 #4

resource reference to actual resource changed in 3.3.0 when using
a master.  it comes over as a String now, so handle that.

This patch the resolve_resource method and adds the additional
conditionals required to that, as all the conditional stuff was
starting to get messy as heck.