fix($resolve): use resolvefn result,not parent resolved value of same name

Made resolve values ignore any keys that we're actively trying to
resolve, when they also exist in some parent state.  Made $$resolves
persist so they can be picked up by a child state in a later digest()
fixes #1317
fixes #1353