Updated CMake file to include testing for Java - works!

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
generate_headers.py prints error when JSON file cannot be loaded to localize problem

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Updated bibtex file

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