Updated and consolidated gitignores