Remove other changes, leaving the fix for the formatter function.
Merge branch 'master' of https://github.com/cbhaley/calibre