fixed energy and sampling for 2wise
Merge branch 'master' of github.com:ebuchman/minimum_probability_flow