tweaks to entropies
Merge pull request #80 from simonbyrne/entropy

tweaks to entropies