Make the file_in_git check more accurate in readd()
Add .orig to gitignore to ignore files generated by merge conflicts.
Bump version