Merge pull request #13 from mlund/develop

Fixed stockmayer nan energies
Working on Linux. Override overlap-check implemented as user-input in input-file.
Only my files
Some wolf-constants were zero, now fixed.
Merge pull request #14 from mlund/develop

Develop
Minor changes
Merge pull request #35 from bjornstenqvist/master

merge w. bjorn