Merge branch 'development' of https://github.com/chebfun/chebfun into development
Minor fixes to documentation for chebfun.tweakDomain().
Merge branch 'fix-chebfun-restrict' into development
Updated tests/chebfun/test_constructor_inputs.m so that it works when the default `minPoints' preference is set to something higher than 9.
Updated tolerances in the other tests so that they pass when the default 'minPoints' preference is set higher than 9.
Merge remote-tracking branch 'upstream/development' into fix-1stkind-nested

Conflicts:
	tests/chebfun/test_cumsum.m
	tests/unbndfun/test_cumsum.m
Merge pull request #541 from chebfun/fix-tests-minpoints

Fixes to some tests when chebtech default preference for minPoints > 9
Merge remote-tracking branch 'chebfun/development' into fix-linop-vscale
Minor fix to test. Closes #540.
Merge pull request #543 from chebfun/fix-test_join

Minor fix to test_join.
Allow Chebfun2 to work with 1st kind points.
Whoops. Forgot to change the grid refinement strategy based on techs.
Fix to quasimatrix plotting with additional args. Closes #537.
Use NH's algorithm for computing CC weights.
Merge branch 'development' into fix-chebop-and
Do column merge in subfunction in chebfun.merge().

As NH points out, we don't have to worry about having to deal with row
chebfuns at multiple exit points if we do things this way.
Fixes to documentation in chebop and parseBC.
Use extractColumns() in chebfun.range() for discrete dimension.

As NH points out, this makes the code agnostic with respect to whether
or not minandmax returns a quasimatrix or an array-valued chebfun.
Merge branch 'development' into feature-chebop-nonlinear

Conflicts:
	tests/chebop/test_linearScalarODEs.m
Merge branch 'feature-chebop-nonlinear' into feature-chebgui-new
Merge remote-tracking branch 'upstream/development' into fix-1stkind-nested

Conflicts:
	tests/chebfun/test_merge.m
	tests/singfun/test_diff.m