Log what type of ToC is used
Merge branch 'master' of https://github.com/cbhaley/calibre

Add two features:

1) The ability to update cached metadata on the device by right clicking
the device icon and selecting 'Update cached metadata'. This has the
same effect as disconnecting and re-connecting the device. It basically
refreshes the device view to reflect any changes made to metadata in the
library after the device was connected.

2) Allow manually matching books on the device to book in the library.
You can right click on a book in the device view and select "Match book
to library" to tell calibre that a book on the device is the same as a
particular book in the library. For the change to stick, you have to use
the 'Update cached metadata' action described above.
Merge branch 'kovidgoyal/master'