All P(k) now outputted to the same file pk.dat.

The normal P(k) and the two kSZ power spectra are now all written
in the same file rather than in three separate files.