Merge branch 'master' of https://github.com/cbhaley/calibre
Use the cache dir for device metadata cache
Add in the stuff to age the smart device book cache, to avoid requiring conversion later.