Ran bootstrap.

I guess Automake didn't agree with the way I fixed a conflict while
merging the cutcell quadrature branch.  Hopefully it's happy now.