wip
Merge branch 'next' of github.com:Erotemic/ibeis into next