Updated to latest mainline, also fixes Gatherer data

Only fixed enUS localization file!