don't halt after computing entropy
Merge branch 'master' of github.com:bumps/bumps