merge w bjorn

Need to restore water2.cpp and stockmayer.cpp examples before merging.