Switch to rebase rather then merging
Update to latest sugar-build