Fix colloc diffmat

This deals with half of #1002.

Note that this branch is branched off of [feature-diffmat](https://github.com/chebfun/chebfun/tree/feature-diffmat) (#1001), which should be merged into development first.