I agree with snapdragon, and the smell fits. Not all snapdragons have the smell. The presence of the smell was actually a criterion for my most recent purchase of a yellow snapdragon. I probably wouldn't have described it as marshmallow, but in retrospect, I can see that.
I'm with altagardener on Linaria vulgaris http://davesgarden.com/guides/pf/go/262/ Flowers & leaves both match, and L. vulgaris occurs in the wild in Tehama county and would be a very good candidate for something that would pop up in a pasture.