Cherry pick Included better documentation for liquid material descriptions

Conflicts:
	mercury_minerals.py
	mercury_model.py