Updated to match latest gemoji

Also has a few commits for making the rebuild scripts work, presumably non-breaking. And also has rebuilt versions of all catalog and json data. Let me know if you'd rather these be split into separate requests.