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