Some CMB comments
Resolved conflict
Tidied up cross-corr section
Merge branch 'master' of https://github.com/david-deboer/msip-2014