Ignore tabix files since they diff every time.
Merge branch 'tbi' into gb_master