chebfun/chebfun — pull request #1017 by nickhale (2014-06-26 14:48:55+00:00)
Title: 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.