Correct treatment of kappa when kappa == 0 and when there is a cutoff.
Fix misplacement of "kappa" in cutoff-GB expression.
Merge branch 'master' of http://github.com/SimTk/openmm
Merge branch 'master' of https://github.com/SimTk/openmm
Merge branch 'master' of https://github.com/swails/openmm
Merge pull request #275 from swails/master

Fixes salt concentration for GB with a cutoff
Merge pull request #276 from peastman/master

Very minor optimization
Fixed lots of compilation errors on Windows
Merge pull request #277 from peastman/winvec

Fixed lots of compilation errors on Windows