mlund/faunus — pull request #40 by mlund (2014-06-26 18:51:15+00:00)
Title: merge w bjorn

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