Several fixes to syncing in the wireless device driver.
1) Handle case where metadata comes from scanning books instead of from calibre.
2) Don't attempt to update a field when one of the two sync columns is None.
3) Refactor code to eliminate interactions between sync types.
Merge branch 'master' of https://github.com/cbhaley/calibre