Makes Emotodex generic for release

Brings `master` up to date.