Upgrade

Upgrade to latest bigpipe and contour.
Defaults can change ;-)