Updated to calibre 2.12.0
Merge branch 'master' of github.com:chef-osx/macapps