Merge pull request #18 from cider-team-mercury/energetics

Added results for 'wishlist' parameters (all but conductivity) for two m...
Added solution to two layer conduction equation in spherical coordinates
and the tex solution
Merge branch 'master' of https://github.com/cider-team-mercury/mercury
added P_cmb to wishlist quantities