Minor index fix, for entries with spaces
Cleaning up debugging code
Merge branch 'master' of https://github.com/pgarst/calibre