Initial Calibre json format fix
Remove my debugging crap.

Add an update variant when importing from a legacy json db.
Some minor fixes when importing a legacy json db

Handle locales in a more robust manner
Don't blow up if a book mentioned in the json isn't actually in the db
(i.e., not on the device, or with different metadata).