Improve flexibility of CHARMM parameter file parsers for CGenFF-created stream files

Fix possible problems when parsing some CHARMM stream files that may not have the same format as the rest of the CHARMM stream files I've seen.

In particular, this applies to CGenFF-created stream files.  This needs to go into 6.1.