More git ignore fixups
Merge branch 'master' into website