Fixed nicknames.  Encounter button shows current Encounter.  New name and encounter text format.  Added GPS clustering.
Merge branch 'master' of github.com:Erotemic/ibeis