Checkpoint
Database merger (minus the hard merge case)
Merge branch 'pyqt5' of github.com:Erotemic/ibeis into pyqt5