Added more gps functionality to encounter. Fixed some unflat_maps
Merge branch 'master' of github.com:Erotemic/ibeis