from adaptivity2 import ... -> from adaptivity import
Let people use development versions of DOLFIN, too.