Fixed encounter computation to be aware of existing encounters
Merge branch 'next' of github.com:Erotemic/ibeis into next