Revert "Moving Sigma and Bivariate compositions"

This reverts commit dc55db56ed87b6a9a46288e3cb6df0039fc3bb95.
should be in ApproxFun