reverted to entropy training
Merge branch 'labeling' of github.com:bmcfee/olda into labeling