Merge pull request #279 from peastman/master

Optimizations to CPU GBSA
Fixed a bug that could potentially cause LJ energy to be nan