Fix handle leak in rebuildJournal and add rename check
Merge pull request #32 from JakeWharton/marcelo/proper_rebuild

Fix handle leak in rebuildJournal and add rename check