Update branches in SF3DG.

* Remove two more branches that Dimitri says are unneeded (and are merged correctly).
* Add devel branch.