Merge pull request #895 from aconley/planck13

Add Planck 2013 cosmology