Fixes salt concentration for GB with a cutoff

This should fix the issues @jchodera was seeing relating to issues #269 and #260.  The results have matched up well with Amber results so far.