Merge pull request #275 from swails/master

Fixes salt concentration for GB with a cutoff
Very minor optimization
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
StateDataReport can report % progress, speed, and time to completion
Optimizations to CPU GBSA
Merge pull request #279 from peastman/master

Optimizations to CPU GBSA
Fixed a bug that could potentially cause LJ energy to be nan
Fixed additional errors on Windows
Bug fix
Merge pull request #280 from peastman/master

Fixed additional errors on Windows
Updated Developer Guide for 6.0
Merge pull request #281 from peastman/master

Updated Developer Guide for 6.0
Merge pull request #278 from peastman/progress

StateDataReport can report % progress, speed, and time to completion
Fixed a bug in OpenCL implementation of CustomGBForce
Same bug fix as the previous commit, but for CUDA
Merge pull request #282 from peastman/master

Fixed a bug in CustomGBForce
Merge pull request #283 from peastman/master

Detect Visual Studio in a way that works correctly with NMake files
Merge pull request #284 from peastman/master

Detect Visual Studio in a way that works correctly with NMake files