IT LIVES! IT LIIIIIVES! (Thanks, Alicia!)

*mutter* *curse* Manually copied new files over after merge decided to stick its fingers in its ears and go 'LALALA' for an hour.