explicitly track node resolution

This allows dynamic nodes to use the values from the stubs without
having the value from the stub just win and override the resolved value.

For example, a template with the following:

  foo: (( bar "-baz" ))

with a stub:

  foo: xyz

will resolve to:

  foo: xyz-baz

Conflicts:
	flow/flow.go