Fix charmm psf

This improves CHARMM PSF parsing so it works for more dialects of PSFs than before.

It also fixes the parsing of some CHARMM stream files that do not fit the same format as the other parameter/stream files I've seen.  The offending stream files were generated by CGenFF, from which I hadn't seen examples before.