Change implicitSolentKappa to implicitSolventSaltConc and convert to
implicitSolventKappa the same (black-magic) way that Amber does. I have never
been able to reproduce the prefactor used to convert to kappa in Amber... sigh.
Merge branch 'master' of http://github.com/SimTk/openmm
Merge remote-tracking branch 'origin'
Update implicit solvent salt concentration/kappa handling. Now, if
implicitSolventKappa is provided it will be used. Otherwise,
implicitSolventSaltConc will be used to compute kappa from the solvent
dielectric constant and simulation temperature.

In order to provide a target temperature, an optional 'temperature' parameter
had to be added to the function call. The docstring makes it clear that
temperature is only used for the salt concentration -> debye length conversion.
Convert temperature from a quantity to float if it's a quantity.

Fix case when OBC2 GB model is used and the salt concentration is non-zero. When
the salt concentration is non-zero, the customgbforces implementation has to be
used (since the native kernel does not support salt concentrations).  However,
since the native kernel runs ~2x faster on CUDA (and most likely far more
efficiently on CPU and Reference, most likely), it is worth continuing to use
the native kernel when possible.
Convert 1/A to 1/nm
Merge pull request #308 from swails/master

Improve usability of salt concentration in Amber custom GB forces