Removed CoolProp import from pyx file

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Fixed conductivity for R404A

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