Subtracted 18 (hydrate) from all ProteinWeights as this is already added in WeightCalculator when necessary.
Merge pull request #42 from jonatanfan/master

Subtracted 18 (hydrate) from all ProteinWeights as this is already added...