Stop tracking original version
Ignore some more files
Fix settings