and now we have a good consistent branch where the removal of rewiring
has been properly reverted before new work is added, so it can be
easily merged with the master branch in the future.

Conflicts:

	src/graph-tool