Merge brings first set of missing building blocks for more general mantle convection models, see issue #156 (closed).