Updates broke too much stuff, rolling back the master until I get it working.
Merge branch 'master' of https://github.com/herp-a-derp/Corruption-of-Champions