Thanks Dave!
My first thought for the plant in the first photo was maybe Encelia californica, or possibly Tagetes or Bidens of some sort but after looking at hundreds of photo's I can't decide. I think the second photo may be Bidens.
The flowers in the first photo seem to have many more petals per bloom:
