Fix .gitignore for backup .classpath files
Remove .orig files from merge