Merge branch 'em' into 'master'

bob.learn.em depnds on bob.db.iris for building docs [skip ci]

See merge request !18