Merge pull request #108 from jchodera/master

Fixed more bugs for explicit solvent systems