Tobbes new quadrature stuff merged back onto the development branch.