More fixes for missing CGAL in demos and unit tests.
  -- make runtests should now pass also if dolfin is not compiled with CGAL
Move petsc4py defines and include directories to compilation of SWIG extension modules