adding changes suggested by AA.
Merge branch 'deltafun-conv-new' of https://github.com/chebfun/chebfun into deltafun-conv-new