Solvation ready to merge

This is needed for the solvation branch in GreenGroup/RMG-Py#126