Water

Added metric `solventfp` to cluster based on weighted solute-solvent distances

Also added a new script `AssignOuter.py` that takes a conformation that is in state i under one clustering, and state j in another clustering and assigns it to a combined state (ij)