Make show icons for new/ignored files on by default
Merge branch 'compare'