Merge pull request #249 from swails/master

Add a salt concentration term to the custom GB forces