updated for newest camb version and added non-linear p(k)