Some changes to CollocationPoints2DFactory to bring it up to par with
CollocationPointsFactory, including zeroes, ones, grid values and fixing
substituteAnalytic.

Style fixes.