Big merge fixes

Merged in the old pulls that hadn't been dealt with. + Added Ninja Ritual Boosts. Please check to make sure ritual boosts work fine, I did my best, but not sure of a great way to check ONG /stealth stuff.