git: Ignoring permanently *.orig files
Merge branch 'tidy-up-core' into tracklist-provider