Combined cp0 terms for fluids in fluid files

Aly-Lee are the only ones that are allowed to fail still, error printed out.  Need to fix this at some point! Could use a vector

Signed-off-by: Ian bell <ian.h.bell@gmail.com>
Fixed more bugs with Humid air - almost back in business

Signed-off-by: Ian bell <ian.h.bell@gmail.com>
Merge branch 'v5' of https://github.com/coolprop/coolprop into v5